From 152684cd768b9f3fdfbbe37d4c63f415a1ef9b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Mon, 25 May 2026 18:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/FullScreenInter.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/layout/FullScreenInter.js b/src/layout/FullScreenInter.js
index 33b4e99..7bdd462 100644
--- a/src/layout/FullScreenInter.js
+++ b/src/layout/FullScreenInter.js
@@ -607,6 +607,18 @@ class FullScreen extends React.Component {
   getDangerSubData = () => {
     const orgId = storage('lacal').getItem('webOrgId')?.val;
     const json = initFilter(orgId);
+    json.Keyword =''
+    if (this.state.selectedDangerCompany) {
+        const selectedCompanyObj = this.state.dangerCompanyData?.find(
+          (company) => company.ID === this.state.selectedDangerCompany
+        );
+        const selectedCompanyName = selectedCompanyObj?.NAME;
+        if (selectedCompanyName) {
+          json.Keyword = selectedCompanyName;
+          // filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
+        }
+      }
+    
     json.Parameter1 = this.state.selectedStartDate?.format('YYYY-MM-DD') || '';
     json.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || '';
     this.props.dispatch({
@@ -615,19 +627,19 @@ class FullScreen extends React.Component {
       url: 'BI/BIKanBanController/JobManage',
       onComplete: (ret) => {
         if (ret && !this.isUnmounted) {
-          let filteredData = ret.jobList;
-          if (this.state.selectedDangerCompany) {
-            const selectedCompanyObj = this.state.dangerCompanyData?.find(
-              (company) => company.ID === this.state.selectedDangerCompany
-            );
-            const selectedCompanyName = selectedCompanyObj?.NAME;
-            if (selectedCompanyName) {
-              filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
-            }
-          }
+          //let filteredData = ret.jobList;
+          // if (this.state.selectedDangerCompany) {
+          //   const selectedCompanyObj = this.state.dangerCompanyData?.find(
+          //     (company) => company.ID === this.state.selectedDangerCompany
+          //   );
+          //   const selectedCompanyName = selectedCompanyObj?.NAME;
+          //   if (selectedCompanyName) {
+          //     filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
+          //   }.
+          // }
 
           this.setState({
-            dangerSubData: filteredData,
+            dangerSubData: ret.jobList,
             jobTodayQty: ret.jobTodayQty,
           });
         }