From 3ce2b46bab3d41020bab5f49956b61bfda1e58a0 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Fri, 27 Oct 2023 15:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8A=A0=E8=BD=BD=E5=8A=A8?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/service/actions/report.js        | 4 ++++
 .../src/sections/service/containers/automaticReport.jsx  | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/client/src/sections/service/actions/report.js b/web/client/src/sections/service/actions/report.js
index 3e94b0b..2e42916 100644
--- a/web/client/src/sections/service/actions/report.js
+++ b/web/client/src/sections/service/actions/report.js
@@ -105,6 +105,10 @@ export function postGenerateReport (data = {}) {       //生成报表
       actionType: 'POST_GENERATE_REPORT',
       url: `${ApiTable.generateReport}`,
       msg: { option: "生成报表" },
+      reducer: {
+         name: "generateReport",
+         params: { noClear: true }
+      }
    });
 }
 
diff --git a/web/client/src/sections/service/containers/automaticReport.jsx b/web/client/src/sections/service/containers/automaticReport.jsx
index f311b05..bc27b72 100644
--- a/web/client/src/sections/service/containers/automaticReport.jsx
+++ b/web/client/src/sections/service/containers/automaticReport.jsx
@@ -8,7 +8,7 @@ import AutomaticModal from '../components/automatic-Modal'
 import SimpleBar from 'simplebar-react';
 
 
-const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socket, projectPoms, pepProjectId }) => {
+const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, generateloading, socket, projectPoms, pepProjectId }) => {
 
    const { service, } = actions;
 
@@ -103,7 +103,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socke
                >
                   <Button theme="borderless" type='danger'>删除</Button>
                </Popconfirm>
-               <Button theme="borderless" onClick={() => {
+               <Button theme="borderless" loading={generateloading} onClick={() => {
                   // WSDJC(温湿度监测) 1002
                   // FSFXJC(风速风向监测)  1001
                   // SSFJC(伸缩缝监测)  4009
@@ -248,14 +248,15 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, socke
 }
 
 function mapStateToProps (state) {
-   const { auth, global, automaticReport, ProjectPoms } = state;
+   const { auth, global, automaticReport, generateReport, ProjectPoms } = state;
    return {
       loading: automaticReport.isRequesting,
       user: auth.user,
       actions: global.actions,
       pepProjectId: global.pepProjectId,
       clientHeight: global?.clientHeight,
-      projectPoms: ProjectPoms?.data?.rows
+      projectPoms: ProjectPoms?.data?.rows,
+      generateloading: generateReport.isRequesting,
    };
 }