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] =?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);