From 0f2ea2becd361abd2ecd1cbf0d561f61d932e430 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Thu, 1 Feb 2024 11:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yg/jbxx.js                               | 16 ++++++++++++++++
 .../declare/components/listPage/transform.vue    |  2 +-
 .../examine/components/listPage/transform.vue    |  4 +++-
 .../floodControlManagement/sluice/tissue.vue     |  6 +++---
 .../responsiblePersonManage/sluice/index.vue     |  6 +++---
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/api/yg/jbxx.js b/src/api/yg/jbxx.js
index 945cd00..3275467 100644
--- a/src/api/yg/jbxx.js
+++ b/src/api/yg/jbxx.js
@@ -1,5 +1,21 @@
 import request from '@/utils/request'
 
+// 饼图
+export function getPie() {
+  return request({
+    url: '/yg/jbxx/getPie',
+    method: 'get',
+  })
+}
+
+// 柱状图图
+export function getHistogram() {
+  return request({
+    url: '/yg/jbxx/getHistogram',
+    method: 'get',
+  })
+}
+
 // 查询水闸安全管理基本信息列表
 export function listJbxx(query) {
   return request({
diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
index d77b5e0..1e0561a 100644
--- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
+++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
@@ -635,7 +635,7 @@ export default {
               }
             });
           } else {
-            this.form.wageId = this.inFo.id;
+            this.form.wagaId = this.inFo.id;
             addHzxx(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
index 4d9f43a..a1aee74 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
@@ -272,6 +272,7 @@ export default {
       fileList1: [],
       fileList2: [],
       visible: false,
+      remark: "",
     };
   },
   created() {
@@ -487,7 +488,7 @@ export default {
         }
       });
       //     } else {
-      //       this.form.wageId = this.inFo.id;
+      //       this.form.wagaId = this.inFo.id;
       //       addHzxx(this.form).then((response) => {
       //         if (response.code === 200) {
       //           this.msgSuccess("新增成功");
@@ -503,6 +504,7 @@ export default {
     notPass() {
       console.log("审核不通过");
       this.form.status = "1";
+      this.form.remark = this.remark;
       updateHzxx(this.form).then((response) => {
         if (response.code === 200) {
           this.msgSuccess("审核不通过");
diff --git a/src/views/safetyManage/floodControlManagement/sluice/tissue.vue b/src/views/safetyManage/floodControlManagement/sluice/tissue.vue
index da7b0ca..5e5b697 100644
--- a/src/views/safetyManage/floodControlManagement/sluice/tissue.vue
+++ b/src/views/safetyManage/floodControlManagement/sluice/tissue.vue
@@ -126,8 +126,8 @@
       <el-table-column
         label="水闸名称"
         align="center"
-        prop="wageId"
-        :formatter="wageIdFormat"
+        prop="wagaId"
+        :formatter="wagaIdFormat"
         min-width="120"
       />
       <el-table-column
@@ -508,7 +508,7 @@ export default {
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.chargePersonType);
     },
-    wageIdFormat(row) {
+    wagaIdFormat(row) {
       const id = row.wagaId;
       // const name = await new Promise(function (resolve, reject) {
       //   getJbxx(id).then((res) => {
diff --git a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue
index c1d8d72..5883a35 100644
--- a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue
+++ b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue
@@ -112,8 +112,8 @@
       <el-table-column
         label="水闸名称"
         align="center"
-        prop="wageId"
-        :formatter="wageIdFormat"
+        prop="wagaId"
+        :formatter="wagaIdFormat"
         min-width="120"
       >
       </el-table-column>
@@ -441,7 +441,7 @@ export default {
         this.loading = false;
       });
     },
-    wageIdFormat(row) {
+    wagaIdFormat(row) {
       const id = row.wagaId;
       // const name = await new Promise(function (resolve, reject) {
       //   getJbxx(id).then((res) => {