From 83abe02406a59adae09f7900e544aef633219c4d Mon Sep 17 00:00:00 2001
From: liao hh <liaohh@example.com>
Date: Wed, 26 Mar 2025 11:12:45 +0800
Subject: [PATCH 01/12] update

---
 .../standardizationConstruction/listPage/index.vue | 14 ++++++++++++--
 src/views/dike/managementTeamManagement/index.vue  |  8 ++++----
 .../sluice/managementTeamManagement/index.vue      |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
index beff0bb..654190b 100644
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -667,7 +667,7 @@
       width="600px"
       center
       :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      @close="handleClose"
     >
       <div class="score-dialog-content">
         <!-- 广东省司价标准 -->
@@ -708,7 +708,7 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" class="submit-btn" @click="dialogVisible = false">提交</el-button>
+          <el-button type="primary" class="submit-btn" @click="handleSubmit">提交</el-button>
         </div>
       </template>
     </el-dialog>
@@ -833,6 +833,16 @@ export default {
     });
   },
   methods: {
+    handleSubmit(){
+      this.dialogVisible = false;
+      this.jlForm = {};
+    },
+
+    handleClose(){
+      this.dialogVisible = false;
+      this.jlForm = {};
+    },
+
     getScore(row){
       if (row.score) {
        const  evalForm = JSON.parse(row.score);
diff --git a/src/views/dike/managementTeamManagement/index.vue b/src/views/dike/managementTeamManagement/index.vue
index 2afab00..fad5fa7 100644
--- a/src/views/dike/managementTeamManagement/index.vue
+++ b/src/views/dike/managementTeamManagement/index.vue
@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="人员类型" prop="personType">
-        <el-select v-model="queryParams.data.personType" placeholder="请选择人员类型" clearable size="small">
+      <el-form-item label="单位类型" prop="personType">
+        <el-select v-model="queryParams.data.personType" placeholder="请选择单位类型" clearable size="small">
           <el-option
             v-for="dict in personTypeOptions"
             :key="dict.dictValue"
@@ -136,8 +136,8 @@
         <el-form-item label="人员名称" prop="personName">
           <el-input v-model="form.personName" placeholder="请输入人员名称" />
         </el-form-item>
-        <el-form-item label="人员类型" prop="personType">
-          <el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%">
+        <el-form-item label="单位类型" prop="personType">
+          <el-select v-model="form.personType" placeholder="请选择单位类型" style="width:100%">
             <el-option
               v-for="dict in personTypeOptions"
               :key="dict.dictValue"
diff --git a/src/views/sluice/managementTeamManagement/index.vue b/src/views/sluice/managementTeamManagement/index.vue
index 5b13e61..e67e76b 100644
--- a/src/views/sluice/managementTeamManagement/index.vue
+++ b/src/views/sluice/managementTeamManagement/index.vue
@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="人员类型" prop="personType">
+      <el-form-item label="单位类型" prop="personType">
         <el-select v-model="queryParams.data.personType" placeholder="请选择人员类型" clearable size="small">
           <el-option
             v-for="dict in personTypeOptions"
@@ -136,7 +136,7 @@
         <el-form-item label="人员名称" prop="personName">
           <el-input v-model="form.personName" placeholder="请输入人员名称" />
         </el-form-item>
-        <el-form-item label="人员类型" prop="personType">
+        <el-form-item label="单位类型" prop="personType">
           <el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%">
             <el-option
               v-for="dict in personTypeOptions"

From f9df497d028eb3eafbbc2f93368249bdb5edb25c Mon Sep 17 00:00:00 2001
From: liao hh <liaohh@example.com>
Date: Wed, 26 Mar 2025 18:09:06 +0800
Subject: [PATCH 02/12] update

---
 src/api/yg/criteria.js                        | 53 ++++++++++++++++++
 .../listPage/index.vue                        | 44 ++++++++++++---
 .../listPage/index.vue                        | 54 ++++++++++++++++---
 3 files changed, 137 insertions(+), 14 deletions(-)
 create mode 100644 src/api/yg/criteria.js

diff --git a/src/api/yg/criteria.js b/src/api/yg/criteria.js
new file mode 100644
index 0000000..15aa878
--- /dev/null
+++ b/src/api/yg/criteria.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询奖惩管理列表
+export function listCriteria(query) {
+  return request({
+    url: '/system/criteria/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询奖惩管理详细
+export function getCriteria(id) {
+  return request({
+    url: '/system/criteria/' + id,
+    method: 'get'
+  })
+}
+
+// 新增奖惩管理
+export function addCriteria(data) {
+  return request({
+    url: '/system/criteria',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改奖惩管理
+export function updateCriteria(data) {
+  return request({
+    url: '/system/criteria',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除奖惩管理
+export function delCriteria(id) {
+  return request({
+    url: '/system/criteria/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出奖惩管理
+export function exportCriteria(query) {
+  return request({
+    url: '/system/criteria/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
index 654190b..bd52bc0 100644
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -672,7 +672,7 @@
       <div class="score-dialog-content">
         <!-- 广东省司价标准 -->
         <div class="score-table">
-          <div class="score-header">广东省司价标准</div>
+          <div class="score-header">广东省评价标准</div>
           <div class="score-content">
             (一: 900 分以上, 前四类 85%; 二: 800 分以上,前四类 75%; 三: 700 分以上,前四类 65%;
             不达标 700 分以下, 前四类 65%)
@@ -690,7 +690,7 @@
           <div class="grid-header">奖励机制</div>
           <div class="grid-content">
             <el-input
-              v-model="jlForm.jljz" placeholder="请输入奖励机制"
+              v-model="jlForm.rewardSystem" placeholder="请输入奖励机制"
             >
 
             </el-input>
@@ -698,7 +698,7 @@
           <div class="grid-header">惩处措施</div>
           <div class="grid-content">
             <el-input
-              v-model="jlForm.cccs" placeholder="请输入惩处措施"
+              v-model="jlForm.punishmentMeasures" placeholder="请输入惩处措施"
             >
             </el-input>
 
@@ -726,6 +726,7 @@ import {
   updateBzhjs,
   exportBzhjs,
 } from "@/api/yg/dike/bzhjs";
+import {listCriteria,addCriteria,updateCriteria} from "@/api/yg/criteria"
 import { listJbxx } from "@/api/yg/dike/jbxx";
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
@@ -752,7 +753,9 @@ export default {
       total: 0,
       // 堤防标准化建设表格数据
       bzhjsList: [],
-      jlForm:{},
+      jlForm:{
+        type: '2',
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -784,6 +787,13 @@ export default {
           sortBy: "desc",
         },
       },
+      criteriaQueryParams:{
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          type: '2',
+        }
+      },
       // 表单参数
       form: {
         // status: "0", //新增
@@ -833,9 +843,29 @@ export default {
     });
   },
   methods: {
+    handleQueryCriteria(){
+      listCriteria(this.criteriaQueryParams).then(res =>{
+        if (res.records.length){
+          this.jlForm = res.records[0];
+        }
+      })
+    },
     handleSubmit(){
-      this.dialogVisible = false;
-      this.jlForm = {};
+      if (this.jlForm.id != null){
+        updateCriteria(this.jlForm).then(res =>{
+          if (res.code === 200) {
+            this.msgSuccess("修改成功");
+            this.dialogVisible = false;
+          }
+        })
+      }else {
+        addCriteria(this.jlForm).then(res =>{
+          if (res.code === 200) {
+            this.msgSuccess("新增成功");
+            this.dialogVisible = false;
+          }
+        })
+      }
     },
 
     handleClose(){
@@ -867,7 +897,7 @@ export default {
       return '一级'
     },
     handleIncentive(){
-      console.log(111)
+      this.handleQueryCriteria();
       this.dialogVisible = true;
     },
 
diff --git a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
index 014c310..13ae622 100644
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -206,12 +206,12 @@
       width="600px"
       center
       :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      @close="handleClose"
     >
       <div class="score-dialog-content">
         <!-- 广东省司价标准 -->
         <div class="score-table">
-          <div class="score-header">广东省司价标准</div>
+          <div class="score-header">广东省评价标准</div>
           <div class="score-content">
             (一: 900 分以上, 前四类 85%; 二: 800 分以上,前四类 75%; 三: 700 分以上,前四类 65%;
             不达标 700 分以下, 前四类 65%)
@@ -229,7 +229,7 @@
           <div class="grid-header">奖励机制</div>
           <div class="grid-content">
             <el-input
-              v-model="jlForm.jljz" placeholder="请输入奖励机制"
+              v-model="jlForm.rewardSystem" placeholder="请输入奖励机制"
             >
 
             </el-input>
@@ -237,7 +237,7 @@
           <div class="grid-header">惩处措施</div>
           <div class="grid-content">
             <el-input
-              v-model="jlForm.cccs" placeholder="请输入惩处措施"
+              v-model="jlForm.punishmentMeasures" placeholder="请输入惩处措施"
             >
             </el-input>
 
@@ -247,7 +247,7 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" class="submit-btn" @click="dialogVisible = false">提交</el-button>
+          <el-button type="primary" class="submit-btn" @click="handleSubmit">提交</el-button>
         </div>
       </template>
     </el-dialog>
@@ -728,6 +728,7 @@ import { listJbxx } from "@/api/yg/jbxx";
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
 import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
+import {addCriteria, listCriteria, updateCriteria} from "@/api/yg/criteria";
 
 export default {
   name: "Bzhjs",
@@ -747,7 +748,9 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
-      jlForm:{},
+      jlForm:{
+        type: '1',
+      },
       // 总条数
       total: 0,
       // 水闸标准化建设表格数据
@@ -810,6 +813,13 @@ export default {
         3: "审核通过",
         4: "已备案",
       },
+      criteriaQueryParams:{
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          type: '1'
+        }
+      },
     };
   },
   created() {
@@ -828,8 +838,38 @@ export default {
     });
   },
   methods: {
+    handleQueryCriteria(){
+      listCriteria(this.criteriaQueryParams).then(res =>{
+        if (res.records.length){
+          this.jlForm = res.records[0];
+        }
+      })
+    },
+    handleSubmit(){
+      if (this.jlForm.id != null){
+        updateCriteria(this.jlForm).then(res =>{
+          if (res.code === 200) {
+            this.msgSuccess("修改成功");
+            this.dialogVisible = false;
+          }
+        })
+      }else {
+        addCriteria(this.jlForm).then(res =>{
+          if (res.code === 200) {
+            this.msgSuccess("新增成功");
+            this.dialogVisible = false;
+          }
+        })
+      }
+    },
+
+    handleClose(){
+      this.dialogVisible = false;
+      this.jlForm = {};
+    },
+
     handleIncentive(){
-      console.log(111)
+      this.handleQueryCriteria();
       this.dialogVisible = true;
     },
     getScore(row){

From f69755d2deb81b6181ef584f641be750003cbd81 Mon Sep 17 00:00:00 2001
From: liao hh <liaohh@example.com>
Date: Wed, 26 Mar 2025 18:48:38 +0800
Subject: [PATCH 03/12] update

---
 .../dike/managementGuarantee/fundGuarantee/index.vue   | 10 +++++-----
 .../sluice/managementGuarantee/fundGuarantee/index.vue |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/dike/managementGuarantee/fundGuarantee/index.vue b/src/views/dike/managementGuarantee/fundGuarantee/index.vue
index 73e0806..41be085 100644
--- a/src/views/dike/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/dike/managementGuarantee/fundGuarantee/index.vue
@@ -34,7 +34,7 @@
         </el-input>
       </el-form-item>
 
-      <el-form-item label="堤防主管部门" prop="unit">
+<!--      <el-form-item label="堤防主管部门" prop="unit">
         <el-input
           v-model="queryParams.data.unit"
           placeholder="请输入堤防主管部门"
@@ -50,7 +50,7 @@
             @click="handleQuery"
           ></el-button>
         </el-input>
-      </el-form-item>
+      </el-form-item>-->
       <!--
       <el-form-item label="单位名称" prop="unitName">
         <el-input
@@ -193,12 +193,12 @@
         :formatter="projectScaleFormat"
         min-width="120"
       /> -->
-      <el-table-column
+<!--      <el-table-column
         label="堤防主管部门"
         align="center"
         prop="unit"
-        min-width="120"
-      />
+        min-width="120"`
+      />-->
       <el-table-column
         label="所在行政区划"
         align="center"
diff --git a/src/views/sluice/managementGuarantee/fundGuarantee/index.vue b/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
index 1a72237..24803a6 100644
--- a/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
@@ -34,7 +34,7 @@
         </el-input>
       </el-form-item>
 
-      <el-form-item label="水闸主管部门" prop="unit">
+<!--      <el-form-item label="水闸主管部门" prop="unit">
         <el-input
           v-model="queryParams.data.unit"
           placeholder="请输入水闸主管部门"
@@ -50,7 +50,7 @@
             @click="handleQuery"
           ></el-button>
         </el-input>
-      </el-form-item>
+      </el-form-item>-->
       <!-- <el-form-item label="单位名称" prop="unitName">
         <el-input
           v-model="queryParams.data.unitName"

From cdf7dd3839baef2cf5512bff4121a3c3bc8bcd72 Mon Sep 17 00:00:00 2001
From: liao hh <liaohh@example.com>
Date: Thu, 27 Mar 2025 10:29:44 +0800
Subject: [PATCH 04/12] =?UTF-8?q?update-=E5=A0=A4=E9=98=B2/=E6=B0=B4?=
 =?UTF-8?q?=E9=97=B8=E7=94=B5=E6=BA=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yg/dike/dfbydy.js                     | 53 +++++++++++++++++++
 .../components/powerList.vue                  |  9 +---
 .../components/powerRecords.vue               |  2 +-
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 src/api/yg/dike/dfbydy.js

diff --git a/src/api/yg/dike/dfbydy.js b/src/api/yg/dike/dfbydy.js
new file mode 100644
index 0000000..b5a43eb
--- /dev/null
+++ b/src/api/yg/dike/dfbydy.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询水闸备用电源信息列表
+export function listBydy(query) {
+  return request({
+    url: '/df/bydy/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询水闸备用电源信息详细
+export function getBydy(id) {
+  return request({
+    url: '/df/bydy/' + id,
+    method: 'get'
+  })
+}
+
+// 新增水闸备用电源信息
+export function addBydy(data) {
+  return request({
+    url: '/df/bydy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改水闸备用电源信息
+export function updateBydy(data) {
+  return request({
+    url: '/df/bydy',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除水闸备用电源信息
+export function delBydy(id) {
+  return request({
+    url: '/df/bydy/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出水闸备用电源信息
+export function exportBydy(query) {
+  return request({
+    url: '/df/bydy/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/dike/safetyManage/floodControlManagement/components/powerList.vue b/src/views/dike/safetyManage/floodControlManagement/components/powerList.vue
index 4096460..2d78d8e 100644
--- a/src/views/dike/safetyManage/floodControlManagement/components/powerList.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/components/powerList.vue
@@ -170,14 +170,7 @@
 </template>
 
 <script>
-import {
-  listBydy,
-  getBydy,
-  delBydy,
-  addBydy,
-  updateBydy,
-  exportBydy,
-} from "@/api/yg/bydy";
+import { listBydy,getBydy,delBydy,addBydy,updateBydy} from "@/api/yg/dike/dfbydy"
 
 export default {
   name: "Bydy",
diff --git a/src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue b/src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue
index 0c18a5c..33bc043 100644
--- a/src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue
@@ -122,7 +122,7 @@ import {
   addBydy,
   updateBydy,
   exportBydy,
-} from "@/api/yg/bydy";
+} from "@/api/yg/dike/dfbydy";
 import pRTable from "./pRTable.vue";
 
 export default {

From bceddd5730838e4f3ca35fe32c6876b9af7398db Mon Sep 17 00:00:00 2001
From: liao hh <liaohh@example.com>
Date: Thu, 27 Mar 2025 11:21:18 +0800
Subject: [PATCH 05/12] update

---
 .../safetyAppraisal/components/statisticsThree.vue          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue
index 3ef87ec..b239136 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue
@@ -151,19 +151,19 @@ export default {
 
         series: [
           {
-            name: "一类堤防",
+            name: "一级堤防",
             type: "bar",
             data: this.barChartData.value1,
             barMaxWidth: "10%",
           },
           {
-            name: "二类堤防",
+            name: "二级堤防",
             type: "bar",
             data: this.barChartData.value2,
             barMaxWidth: "10%",
           },
           {
-            name: "三类堤防",
+            name: "三级堤防",
             type: "bar",
             data: this.barChartData.value3,
             barMaxWidth: "10%",

From 8920b4e3d43f304e4bfef3599f837c24ea1fb884 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Thu, 27 Mar 2025 11:53:03 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E7=AB=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../options/dikeCrossSectionTrait.vue         | 336 +++++++++---------
 .../components/listBaseInfo.vue               |   6 +-
 .../components/listBaseInfo_em.vue            |   4 +-
 .../safetyManage/safetyAppraisal/list.vue     |   9 +-
 .../sluiceBaseInfo/options/accidentRecord.vue |  23 --
 .../options/engineeringStructure.vue          |  55 +--
 .../components/listBaseInfo.vue               |   4 +-
 .../safetyManage/safetyAppraisal/list.vue     |   6 +-
 vue.config.js                                 |   2 +-
 9 files changed, 194 insertions(+), 251 deletions(-)

diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
index f5cb0b1..2835874 100644
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
@@ -212,174 +212,174 @@
         prop="intrCh"
         min-width="120"
       />
-      <el-table-column
-        label="至起始断面距离"
-        align="center"
-        prop="tointrDs"
-        min-width="120"
-      />
-      <el-table-column
-        label="起测点位置"
-        align="center"
-        prop="jmsrpnPl"
-        min-width="120"
-      />
-      <el-table-column
-        label="起测点高程"
-        align="center"
-        prop="jmsrpneLev"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤身土质"
-        align="center"
-        prop="bnbdSlch"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤身防渗形式"
-        align="center"
-        prop="bnbdAntp"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤基地质"
-        align="center"
-        prop="bnbsGl"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤基防渗形式"
-        align="center"
-        prop="bnbsAntp"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤身净高度"
-        align="center"
-        prop="bnbdHigh"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤顶高程"
-        align="center"
-        prop="bntpeLev"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤顶超高"
-        align="center"
-        prop="bntpFr"
-        min-width="120"
-      />
-      <el-table-column
-        label="堤顶宽度"
-        align="center"
-        prop="bntpWd"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面堤脚高程"
-        align="center"
-        prop="upbnToel"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河面堤脚高程"
-        align="center"
-        prop="dwbnToel"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河坡坡比"
-        align="center"
-        prop="upslSlrt"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河坡坡比"
-        align="center"
-        prop="dwslSlrt"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河坡坡比"
-        align="center"
-        prop="upslSlrt"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河坡护坡情况"
-        align="center"
-        prop="uspsIn"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河坡护坡情况"
-        align="center"
-        prop="dspsIn"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面滩地宽度"
-        align="center"
-        prop="upbtWide"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面滩地宽度"
-        align="center"
-        prop="upbtWide"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面平台(前戗)顶高程"
-        align="center"
-        prop="ufrteLev"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面平台(前戗)顶宽"
-        align="center"
-        prop="ufrtWide"
-        min-width="120"
-      />
-      <el-table-column
-        label="迎河面平台(前戗)坡度"
-        align="center"
-        prop="upflRfsl"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河面平台(后戗)顶高程"
-        align="center"
-        prop="dfrtEl"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河面平台(后戗)顶高程"
-        align="center"
-        prop="dfrtEl"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河面平台(后戗)顶宽"
-        align="center"
-        prop="dfrtWide"
-        min-width="120"
-      />
-      <el-table-column
-        label="背河面平台(后戗)坡度"
-        align="center"
-        prop="dwflRfsl"
-        min-width="120"
-      />
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="note"
-        min-width="120"
-      />
+<!--      <el-table-column-->
+<!--        label="至起始断面距离"-->
+<!--        align="center"-->
+<!--        prop="tointrDs"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="起测点位置"-->
+<!--        align="center"-->
+<!--        prop="jmsrpnPl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="起测点高程"-->
+<!--        align="center"-->
+<!--        prop="jmsrpneLev"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤身土质"-->
+<!--        align="center"-->
+<!--        prop="bnbdSlch"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤身防渗形式"-->
+<!--        align="center"-->
+<!--        prop="bnbdAntp"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤基地质"-->
+<!--        align="center"-->
+<!--        prop="bnbsGl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤基防渗形式"-->
+<!--        align="center"-->
+<!--        prop="bnbsAntp"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤身净高度"-->
+<!--        align="center"-->
+<!--        prop="bnbdHigh"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤顶高程"-->
+<!--        align="center"-->
+<!--        prop="bntpeLev"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤顶超高"-->
+<!--        align="center"-->
+<!--        prop="bntpFr"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="堤顶宽度"-->
+<!--        align="center"-->
+<!--        prop="bntpWd"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面堤脚高程"-->
+<!--        align="center"-->
+<!--        prop="upbnToel"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河面堤脚高程"-->
+<!--        align="center"-->
+<!--        prop="dwbnToel"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河坡坡比"-->
+<!--        align="center"-->
+<!--        prop="upslSlrt"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河坡坡比"-->
+<!--        align="center"-->
+<!--        prop="dwslSlrt"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河坡坡比"-->
+<!--        align="center"-->
+<!--        prop="upslSlrt"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河坡护坡情况"-->
+<!--        align="center"-->
+<!--        prop="uspsIn"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河坡护坡情况"-->
+<!--        align="center"-->
+<!--        prop="dspsIn"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面滩地宽度"-->
+<!--        align="center"-->
+<!--        prop="upbtWide"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面滩地宽度"-->
+<!--        align="center"-->
+<!--        prop="upbtWide"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面平台(前戗)顶高程"-->
+<!--        align="center"-->
+<!--        prop="ufrteLev"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面平台(前戗)顶宽"-->
+<!--        align="center"-->
+<!--        prop="ufrtWide"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="迎河面平台(前戗)坡度"-->
+<!--        align="center"-->
+<!--        prop="upflRfsl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河面平台(后戗)顶高程"-->
+<!--        align="center"-->
+<!--        prop="dfrtEl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河面平台(后戗)顶高程"-->
+<!--        align="center"-->
+<!--        prop="dfrtEl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河面平台(后戗)顶宽"-->
+<!--        align="center"-->
+<!--        prop="dfrtWide"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="背河面平台(后戗)坡度"-->
+<!--        align="center"-->
+<!--        prop="dwflRfsl"-->
+<!--        min-width="120"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="备注"-->
+<!--        align="center"-->
+<!--        prop="note"-->
+<!--        min-width="120"-->
+<!--      />-->
       <!-- <el-table-column
         label="责任人类型"
         align="center"
diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
index 0f714e8..2593ba1 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="15">
       <el-form ref="form" :model="form" :rules="rules" label-width="152px">
         <el-col :span="24">
-          <el-form-item label="堤防名称">
+          <el-form-item label="堤防名称1">
             <el-input v-model="dikeName" disabled />
           </el-form-item>
         </el-col>
@@ -258,7 +258,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "Aqjdxx",
-  props: ["dikeName", "dfrwId"],
+  props: ["dikeName", "dfrwId","dikeCode"],
   data() {
     return {
       // 遮罩层
@@ -519,6 +519,8 @@ export default {
             });
           } else {
             this.form.dfrwId = this.dfrwId;
+            console.log(this.dikeCode,'dikkkkkk')
+            this.form.remark=this.dikeCode
             addAqjdxx(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue
index c3df1c7..d0cb9e8 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue
@@ -12,7 +12,7 @@
       :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
-        <template slot="label"> 堤防名称 </template>
+        <template slot="label"> 堤防名称1 </template>
         {{ this.dikeName }}
       </el-descriptions-item>
       <el-descriptions-item>
@@ -149,7 +149,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "Aqjdxx",
-  props: ["dikeName", "dfrwId"],
+  props: ["dikeName", "dfrwId","dikeCode"],
   data() {
     return {
       // 遮罩层
diff --git a/src/views/dike/safetyManage/safetyAppraisal/list.vue b/src/views/dike/safetyManage/safetyAppraisal/list.vue
index bc5b831..552d873 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/list.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/list.vue
@@ -20,7 +20,7 @@
     >
       <el-form-item label="堤防名称" prop="dikeName">
         <el-select
-          v-model="queryParams.data.dikeId"
+          v-model="queryParams.data.dikeCode"
           placeholder="请选择堤防名称"
           style="width: 100%"
           filterable
@@ -256,6 +256,7 @@
           <listBaseInfo
             ref="listBaseInfo"
             :dfrwId="dfrwId"
+            :dikeCode="dikeCode"
             @closeParentTabs="closeTabs"
             @cancelParent="cancel"
           />
@@ -290,6 +291,7 @@
             ref="listBaseInfoEm"
             :dfrwId="dfrwId"
             :dikeName="dikeName"
+            :dikeCode="dikeCode"
             @cancelParent="cancel"
           />
         </el-tab-pane>
@@ -415,6 +417,7 @@ export default {
         pageSize: 10,
         ids: null,
         data: {
+          dikeCode:null,
           dikeId: null,
           taskId: null,
           planTime: null,
@@ -438,6 +441,7 @@ export default {
       rules: {},
       dfrwId: "",
       dikeName:'',
+      dikeCode:'',
       visible: false,
       remark: "",
     };
@@ -528,6 +532,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         data: {
+          dikeCode:null,
           id: null,
           dikeId: null,
           taskId: null,
@@ -567,6 +572,8 @@ export default {
       this.form = row;
       this.dfrwId = row.id;
       this.dikeName = row.dikeName;
+      this.dikeCode=row.dikeCode
+
       this.open = true;
       this.title = "填报安全鉴定信息";
       // getSzrw(id).then((response) => {
diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
index e7f9c72..26c2a02 100644
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
@@ -12,23 +12,6 @@
       }"
       :contentStyle="{ minWidth: '350px' }"
     >
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 发现时间 </template>-->
-<!--        {{ this.form.fntm }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label">险情级别 </template>-->
-<!--        {{ dnstgrFormat(this.form) }}-->
-<!--      </el-descriptions-item>-->
-
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 险情名称 </template>-->
-<!--        {{ this.form.dnsttm }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 险情部位 </template>-->
-<!--        {{ this.form.dnstps }}-->
-<!--      </el-descriptions-item>-->
       <el-descriptions-item>
         <template slot="label"> 水闸名称 </template>
         {{ wagaName }}
@@ -49,12 +32,6 @@
         <template slot="label"> 水闸险情类别 </template>
         {{ dnstgrFormat(this.form) }}
       </el-descriptions-item>
-
-
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 除险措施 </template>-->
-<!--        {{ this.form.rhms }}-->
-<!--      </el-descriptions-item>-->
       <el-descriptions-item>
         <template slot="label"> 备注 </template>
         {{ this.form.note }}
diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
index fcf4bfc..f1d8b70 100644
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
@@ -78,22 +78,12 @@
         <template slot="label"> 启闭机数量（个） </template>
         {{ this.form.hsgram }}
       </el-descriptions-item>
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸身总宽（m） </template>-->
-<!--        {{ this.form.gtttwd }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸身总长（m） </template>-->
-<!--        {{ this.form.gtttlen }}-->
-<!--      </el-descriptions-item>-->
+
       <el-descriptions-item>
         <template slot="label"> 闸门顶高程（m） </template>
         {{ this.form.gttpel }}
       </el-descriptions-item>
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸底板高程（m） </template>-->
-<!--        {{ this.form.gtflel }}-->
-<!--      </el-descriptions-item>-->
+
       <el-descriptions-item>
         <template slot="label"> 消能型式 </template>
         {{ endsstFormat(this.form) }}
@@ -102,46 +92,7 @@
         <template slot="label"> 闸门型式 </template>
         {{ gtstFormat(this.form) }}
       </el-descriptions-item>
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸门尺寸（m） </template>-->
-<!--        {{ this.form.note }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸门自重（t） </template>-->
-<!--        {{ this.form.gtddld }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 闸基防渗措施 </template>-->
-<!--        {{ gtbsasmsFormat(this.form) }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 工作桥面宽度（m） </template>-->
-<!--        {{ this.form.srbrwd }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 工作桥面高程（m） </template>-->
-<!--        {{ this.form.srbrel }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 检修桥面宽度（m） </template>-->
-<!--        {{ this.form.embrwd }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 检修桥面高程（m） </template>-->
-<!--        {{ this.form.embrel }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 交通桥标准 </template>-->
-<!--        {{ acbrstFormat(this.form) }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 交通桥面宽度（m） </template>-->
-<!--        {{ this.form.acbrwd }}-->
-<!--      </el-descriptions-item>-->
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label"> 交通桥面高程（m） </template>-->
-<!--        {{ this.form.acbrel }}-->
-<!--      </el-descriptions-item>-->
+
       <el-descriptions-item>
         <template slot="label"> 备注 </template>
         {{ this.form.note }}
diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
index 6358919..8b050c4 100644
--- a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
@@ -258,7 +258,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "Aqjdxx",
-  props: ["wagaName", "szrwId"],
+  props: ["wagaName", "szrwId","wagaCode"],
   data() {
     return {
       // 遮罩层
@@ -500,6 +500,7 @@ export default {
           this.form.safetyEvaluationReport = JSON.stringify(this.fileList1);
           this.form.safetyAppraisalReport = JSON.stringify(this.fileList2);
           this.form.safetyAppraisalOpinion = JSON.stringify(this.fileList3);
+          console.log(this.wagaCode,'waaaaaa')
           if (this.form.id != null) {
             updateAqjdxx(this.form).then((response) => {
               if (response.code === 200) {
@@ -511,6 +512,7 @@ export default {
             });
           } else {
             this.form.szrwId = this.szrwId;
+            this.form.remark=this.wagaCode;
             addAqjdxx(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
diff --git a/src/views/sluice/safetyManage/safetyAppraisal/list.vue b/src/views/sluice/safetyManage/safetyAppraisal/list.vue
index 9f0d199..77397bc 100644
--- a/src/views/sluice/safetyManage/safetyAppraisal/list.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/list.vue
@@ -257,6 +257,7 @@
           <listBaseInfo
             ref="listBaseInfo"
             :szrwId="szrwId"
+            :wagaCode="wagaCode"
             :wagaName="wagaName"
             @cancelParent="cancel"
           />
@@ -383,6 +384,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      wagaName:'',
       // 总条数
       total: 0,
       // 水闸鉴定任务关联表格数据
@@ -429,6 +431,7 @@ export default {
       szrwId: "",
       visible: false,
       remark: "",
+      wagaCode:"",
     };
   },
   created() {
@@ -449,7 +452,7 @@ export default {
     handleDetial(row){
       this.openDetial = true;
       this.szrwId = row.id;
-      this.wagaName = row.wageName;
+      this.wagaName = row.wagaName;
       this.detailDsable = true;
 
     },
@@ -563,6 +566,7 @@ export default {
       this.form = row;
       this.szrwId = row.id;
       this.wagaName = row.wagaName;
+      this.wagaCode=row.wagaCode;
       this.open = true;
       this.title = "填报安全鉴定信息";
       // getSzrw(id).then((response) => {
diff --git a/vue.config.js b/vue.config.js
index d012c6b..d294962 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -81,7 +81,7 @@ module.exports = {
       },
       [process.env.VUE_APP_BASE_API]: {
         // target: "http://shuili.product.dev.com:30115/",
-        target: "http://192.168.2.107:18082/",
+        target: "http://127.0.0.1:18082/",
         // target: 'http://172.16.32.62:18888/',
         // target: "http://172.16.34.27:18082",
         changeOrigin: true,

From 7b5eb12bdd33bf0e9e9d2ee752a322639f8e18da Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Mon, 31 Mar 2025 15:25:10 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E7=AB=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyManage/responsiblePersonManage/components/list.vue   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue b/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
index 4520499..2aeeaa8 100644
--- a/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
+++ b/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
@@ -130,8 +130,7 @@
       <el-table-column
         label="水闸名称"
         align="center"
-        prop="wagaCode"
-        :formatter="wagaCodeFormat"
+        prop="wagaName"
         min-width="120"
       >
       </el-table-column>

From 2511ee6959a2bb2b10253b1572b55e4715458b85 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Mon, 31 Mar 2025 15:53:46 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E7=AB=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../responsiblePersonManage/components/list.vue            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue b/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
index 2aeeaa8..6b963b4 100644
--- a/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
+++ b/src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
@@ -508,12 +508,7 @@ export default {
     },
     wagaCodeFormat(row) {
       const wagaCode = row.wagaCode;
-      // const name = await new Promise(function (resolve, reject) {
-      //   getJbxx(id).then((res) => {
-      //     // console.log(111, res);
-      //     resolve(res.data.wagaName);
-      //   });
-      // });
+
       let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
       if (data) return data.wagaName;
     },

From 0f9887535cad6ed515eaf85155b84a5d2ac6fe07 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Tue, 1 Apr 2025 18:09:41 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E7=AB=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dikeBaseInfo/options/historyOverflowsRecords.vue | 12 +++++++++---
 .../dikeBaseInfo/options/index.vue                   |  6 +++++-
 .../standardizationConstruction/listPage/index.vue   |  2 +-
 .../listPage/options/historyOverflowsRecords.vue     |  4 ++--
 .../declare/components/listPage/options/index.vue    |  2 +-
 .../sluiceBaseInfo/options/dischargeCapacity2.vue    |  3 ++-
 .../sluiceBaseInfo/options/index.vue                 |  4 +++-
 .../standardizationConstruction/listPage/index.vue   |  2 +-
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
index 419b748..d6ea98c 100644
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
@@ -122,7 +122,11 @@
         align="center"
         prop="dikeName"
         min-width="120"
-      />
+      >
+        <template>
+          {{ this.formData.dikeName}}
+        </template>
+      </el-table-column>
       <el-table-column
         label="记录更新时间"
         align="center"
@@ -210,7 +214,7 @@ import {
 
 export default {
   name: "Jyjl",
-  props: ["dikeCode"],
+  props: ["dikeCode","formData"],
   data() {
     return {
       // 遮罩层
@@ -281,11 +285,13 @@ export default {
     },
     /** 查询决溢记录列表 */
     getList() {
+      this.loading=true
       this.queryParams.data.dikeCode = this.dikeCode;
       listJyjl(this.queryParams).then((response) => {
         if (response.records[0]) {
           this.form = response.records[0];
-          this.tableData=response.record;
+          this.tableData=response.records;
+          console.log(this.tableData)
           this.loading=false
         }
       });
diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
index fa94be9..90623dd 100644
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
@@ -73,7 +73,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <historyOverflowsRecords :dikeCode="this.formData.dikeCode" />
+        <historyOverflowsRecords
+          v-if="activeName === 'historyOverflowsRecords'"
+          :dikeCode="this.formData.dikeCode"
+          :form-data="formData"
+        />
       </el-tab-pane>
       <el-tab-pane
         label="主要效益指标"
diff --git a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
index bd52bc0..aaf4078 100644
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -1093,7 +1093,7 @@ export default {
         if (this.form.score) {
           this.evalForm = JSON.parse(this.form.score);
           const value = Object.values(this.evalForm.score);
-          this.sum=this.sum-value.reduce((a, b) => {
+          this.sum=1050-value.reduce((a, b) => {
             // 确保每个值都是数字
             return a + Number(b);
           }, 0);
diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue
index 0e78a80..d25b189 100644
--- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue
@@ -140,8 +140,8 @@ export default {
     getList() {
       this.queryParams.data.dikeCode = this.dikeCode;
       listJyjl(this.queryParams).then((response) => {
-        if (response.records[0]) {
-          this.form = response.records[0];
+        if (response.records) {
+          this.form = response.records;
         }
       });
     },
diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue
index fe1e3d4..1c2f0ec 100644
--- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue
@@ -81,7 +81,7 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <historyOverflowsRecords :dikeCode="this.formData.dikeCode" />
+        <historyOverflowsRecords   v-if="activeName === 'historyOverflowsRecords'" :dikeCode="this.formData.dikeCode" />
       </el-tab-pane>
       <el-tab-pane
         label="主要效益指标"
diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
index 0efbad6..6051576 100644
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
@@ -57,7 +57,7 @@ import {
 
 export default {
   name: "Xlnl",
-  props: ["wagaName"],
+  props: ["wagaName","wagaCode"],
   data() {
     return {
       // 遮罩层
@@ -94,6 +94,7 @@ export default {
           updateUid: null,
           proCode: null,
           proNo: null,
+          wagaCode:null,
           owerDept: null,
           relation: null,
         },
diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
index 5e15f4a..8d73856 100644
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
@@ -46,7 +46,9 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <dischargeCapacity2 :wagaName="formData.wagaName" :wagaCode="formData.wagaCode"/>
+        <dischargeCapacity2
+          v-if="activeName === 'dischargeCapacity2'"
+          :wagaName="formData.wagaName" :wagaCode="formData.wagaCode"/>
       </el-tab-pane>
 
       <el-tab-pane
diff --git a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
index 13ae622..552c65c 100644
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -1087,7 +1087,7 @@ export default {
         if (this.form.score) {
           this.evalForm = JSON.parse(this.form.score);
           const value = Object.values(this.evalForm.score);
-          this.sum=this.sum-value.reduce((a, b) => {
+          this.sum=1050-value.reduce((a, b) => {
             // 确保每个值都是数字
             return a + Number(b);
           }, 0);

From 2961749ed6757757ffed9289051d247684812ef1 Mon Sep 17 00:00:00 2001
From: wuxu <1159559925@qq.com>
Date: Wed, 2 Apr 2025 21:40:13 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=8F=90=E9=98=B2/=E6=B0=B4=E9=97=B8=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=8C=89=E9=92=AE=EF=BC=9B=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=80=E6=A0=B7=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyAppraisal/components/listSafetyDetection.vue | 10 ++++++++++
 src/views/dike/safetyManage/safetyAppraisal/list.vue   |  2 ++
 .../safetyAppraisal/components/listSafetyDetection.vue |  9 +++++++++
 src/views/sluice/safetyManage/safetyAppraisal/list.vue |  6 ++++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
index ec35da9..013fd43 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
@@ -227,6 +227,13 @@ export default {
       fileList1: [],
       fileList2: [],
     };
+  },
+     watch: {
+    // 每当 message 改变时，这个函数就会执行
+    dfrwId(newVal, oldVal) {
+      console.log('message changed:', oldVal, '→', newVal)
+       this.getList();
+    }
   },
   created() {
     this.getList();
@@ -260,7 +267,10 @@ export default {
           if (this.form.calculationResults) {
             this.fileList2 = JSON.parse(this.form.calculationResults);
           }
+        }else{
+           this.reset();
         }
+
         // this.total = response.total;
         // this.loading = false;
       });
diff --git a/src/views/dike/safetyManage/safetyAppraisal/list.vue b/src/views/dike/safetyManage/safetyAppraisal/list.vue
index 552d873..d839dff 100644
--- a/src/views/dike/safetyManage/safetyAppraisal/list.vue
+++ b/src/views/dike/safetyManage/safetyAppraisal/list.vue
@@ -181,6 +181,7 @@
           >查看报告</el-button>
           <el-button
             size="mini"
+            v-if="scope.row.status != '3'"
             type="text"
             icon="el-icon-edit"
             @click="fillOut(scope.row)"
@@ -196,6 +197,7 @@
           </el-button>
           <el-button
             size="mini"
+            v-if="scope.row.status != '3'"
             type="text"
             icon="el-icon-edit"
             @click="examine(scope.row)"
diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
index 0c2a18e..399575e 100644
--- a/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
@@ -227,6 +227,13 @@ export default {
       fileList1: [],
       fileList2: [],
     };
+  },
+   watch: {
+    // 每当 message 改变时，这个函数就会执行
+    szrwId(newVal, oldVal) {
+      console.log('message changed:', oldVal, '→', newVal)
+       this.getList();
+    }
   },
   created() {
     this.getList();
@@ -260,6 +267,8 @@ export default {
           if (this.form.calculationResults) {
             this.fileList2 = JSON.parse(this.form.calculationResults);
           }
+        }else{
+          this.reset();
         }
         // this.total = response.total;
         // this.loading = false;
diff --git a/src/views/sluice/safetyManage/safetyAppraisal/list.vue b/src/views/sluice/safetyManage/safetyAppraisal/list.vue
index 77397bc..1e5b278 100644
--- a/src/views/sluice/safetyManage/safetyAppraisal/list.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/list.vue
@@ -175,6 +175,7 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
+            v-if="scope.row.status != '3'"
             type="text"
             icon="el-icon-edit"
             @click="fillOut(scope.row)"
@@ -196,20 +197,21 @@
           >查看报告</el-button>
           <el-button
             size="mini"
+            v-if="scope.row.status != '3'"
             type="text"
             icon="el-icon-edit"
             @click="examine(scope.row)"
             v-hasPermi="['sz:szrw:examine']"
             >审核</el-button
           >
-          <el-button
+        <!--  <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['sz:szrw:remove']"
             >删除</el-button
-          >
+          >-->
         </template>
       </el-table-column>
     </el-table>

From d8b4a7c097c36c61df71c23d355ea960c65fdf33 Mon Sep 17 00:00:00 2001
From: wuxu <1159559925@qq.com>
Date: Thu, 3 Apr 2025 10:57:54 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardizationConstruction/listPage/index.vue            | 2 +-
 .../standardizationConstruction/listPage/index.vue            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
index aaf4078..d4bcb09 100644
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -309,7 +309,7 @@
                 style="width: 400px"
               >
                 <span>
-                  广东省司价标准<br />
+                  广东省评价标准<br />
                   (一: 900分以上，前四类85%:二: 800分以上,前四类75%: 三:
                   700分以上,前四65%:不达标 700分以下，前四类65%)
                 </span>
diff --git a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
index 552c65c..20eb657 100644
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
@@ -209,7 +209,7 @@
       @close="handleClose"
     >
       <div class="score-dialog-content">
-        <!-- 广东省司价标准 -->
+        <!-- 广东省评价标准 -->
         <div class="score-table">
           <div class="score-header">广东省评价标准</div>
           <div class="score-content">
@@ -361,7 +361,7 @@
                 style="width: 400px"
               >
                 <span>
-                  广东省司价标准<br />
+                  广东省评价标准<br />
                   (一: 900分以上，前四类85%:二: 800分以上,前四类75%: 三:
                   700分以上,前四65%:不达标 700分以下，前四类65%)
                 </span>

From a5dae0bef9547761e6db738dcbfc5f619ecefe03 Mon Sep 17 00:00:00 2001
From: wuxu <wuxukgdvj>
Date: Thu, 3 Apr 2025 14:42:27 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=80=E7=B1=BB=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyAppraisal/components/statisticsThree.vue          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue
index fc1d5df..e7b3104 100644
--- a/src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue
+++ b/src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue
@@ -150,19 +150,19 @@ export default {
 
         series: [
           {
-            name: "一类水闸",
+            name: "一级水闸",
             type: "bar",
             data: this.barChartData.value1,
             barMaxWidth: "10%",
           },
           {
-            name: "二类水闸",
+            name: "二级水闸",
             type: "bar",
             data: this.barChartData.value2,
             barMaxWidth: "10%",
           },
           {
-            name: "三类水闸",
+            name: "三级水闸",
             type: "bar",
             data: this.barChartData.value3,
             barMaxWidth: "10%",