Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/components/CustomPages/BI/BI064FormRunAnalysis.js

@@ -16,8 +16,8 @@ class BI064FormRunAnalysis extends React.Component {
       startTime:moment(this.getDate(), 'YYYY-MM-DD 00:00:00'),//moment(new Date()).add(-1, "month").format('YYYY-MM-DD 00:00:00'),
       endTime:moment(this.getEndDate(), 'YYYY-MM-DD 23:59:59'),
       selectForms:['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表',
-      '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报完善',
+      '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报',
-       '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请'],
+       '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请','重大隐患销号表'],
       retData: [], // 表单运行数据
       companyData: [], // 公司数据
       loading: true,
@@ -138,14 +138,14 @@ getEndDate=()=>{
   };
   handleSearch2 = (value) => {
     let  temps = ['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表',
-    '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报完善',
+    '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报',
-     '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请'];
+     '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请','重大隐患销号表'];
     
     if(value === "双重预防机制" )
     {
       temps = ['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表',
-        '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报完善',
+        '安全风险评估汇总表', '风险检查关联表','安全检查通知','安全检查记录','安全检查记录汇总','隐患上报','手动隐患上报',
-         '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请'];
+         '隐患确认单','隐患整改通知单', '隐患整改记录', '延期整改申请','重大隐患销号表'];
     }
     if(value === "作业现场安全管理" )
     {
@@ -156,8 +156,8 @@ getEndDate=()=>{
     if(value === "安全教育与培训" )
     {
      
-      temps = ['安全意识调查', '培训需求调查','培训通知', '培训通知（转训）','培训记录', '培训效果评估调查表', '三级安全教育培训记录',
+      temps = ['安全意识调查', '培训需求调查','培训计划','培训通知', '培训通知（转训）','培训记录', '培训效果评估调查表',
-         '新三级安全教育记录', '新三级安全教育卡' ];
+         '新三级安全教育记录' ];
     }
     this.setState({
       inputText2: value,
@@ -606,7 +606,7 @@ getEndDate=()=>{
             系统运行情况统计分析
           </h1>
           <Row style={{ width: '100%', margin: 'auto' }}>
-            <Col span={5}>
+            <Col span={3}>
               <Form.Item label={'公司名称'} {...formItemLayout}>
                 <DropDownPagination
                   inputDataApi={'FM/Organization/OrderPaged'}
@@ -620,7 +620,7 @@ getEndDate=()=>{
                 />
               </Form.Item>
             </Col>
-            <Col span={5}>
+            <Col span={4}>
             <Form.Item
               label={'模块'}
               {...formItemLayout}

src/layout/FullOther/HomeContent.js

@@ -991,7 +991,7 @@ class HomeContent extends React.Component {
                     <div className={styles.infoBottomContentRight}>
                       <div className={styles.infoBottomTitle}>生产规模</div>
                       <div className={styles.infoBottomNum}>
-                        <span>{trainingData?.SumSubMode || '-'}</span>吨/年
+                        <span>{trainingData?.SumSubMode || '-'}</span>万吨/年
                       </div>
                     </div>
                   </div>

src/layout/FullScreenInter.js

@@ -607,27 +607,39 @@ class FullScreen extends React.Component {
   getDangerSubData = () => {
     const orgId = storage('lacal').getItem('webOrgId')?.val;
     const json = initFilter(orgId);
-    json.Parameter1 = this.state.selectedStartDate.format('YYYY-MM-DD');
+    json.Keyword =''
-    json.Parameter2 = this.state.selectedEndDate.format('YYYY-MM-DD');
+    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({
       type: 'app/getDataByPost',
       payload: json,
       url: 'BI/BIKanBanController/JobManage',
       onComplete: (ret) => {
         if (ret && !this.isUnmounted) {
-          let filteredData = ret.jobList;
+          //let filteredData = ret.jobList;
-          if (this.state.selectedDangerCompany) {
+          // if (this.state.selectedDangerCompany) {
-            const selectedCompanyObj = this.state.dangerCompanyData?.find(
+          //   const selectedCompanyObj = this.state.dangerCompanyData?.find(
-              (company) => company.ID === this.state.selectedDangerCompany
+          //     (company) => company.ID === this.state.selectedDangerCompany
-            );
+          //   );
-            const selectedCompanyName = selectedCompanyObj?.NAME;
+          //   const selectedCompanyName = selectedCompanyObj?.NAME;
-            if (selectedCompanyName) {
+          //   if (selectedCompanyName) {
-              filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
+          //     filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
-            }
+          //   }.
-          }
+          // }
 
           this.setState({
-            dangerSubData: filteredData,
+            dangerSubData: ret.jobList,
             jobTodayQty: ret.jobTodayQty,
           });
         }

src/layout/Header.js

@@ -394,42 +394,6 @@ const NavOpton = (props) => {
   }
 };
 const FullScreenOpton = (props) => {
-  const [showModal, setshowModal] = useState(false);
-  const getChildCount = (val) => {
-    setshowModal(val);
-  };
-  const [fullScreen, setFullScreen] = useState(false);
-  const [originResizeFunc, setOriginResizeFunc] = useState();
-  const escFunction = () => {
-    let isFull = !!(
-      document.fullscreen ||
-      document.mozFullScreen ||
-      document.webkitIsFullScreen ||
-      document.webkitFullScreen ||
-      document.msFullScreen
-    );
-    if (isFull) {
-      // /
-    } else {
-      // requestFullScreenMethod(document.body);
-      setshowModal(false);
-    }
-  };
-  useEffect(() => {
-    // 监听退出全屏事件 --- chrome 用 esc 退出全屏并不会触发 keyup 事件
-    document.addEventListener('webkitfullscreenchange', escFunction); /* Chrome, Safari and Opera */
-    document.addEventListener('mozfullscreenchange', escFunction); /* Firefox */
-    document.addEventListener('fullscreenchange', escFunction); /* Standard syntax */
-    document.addEventListener('msfullscreenchange', escFunction); /* IE / Edge */
-    return () => {
-      //销毁时清除监听
-      document.removeEventListener('webkitfullscreenchange', escFunction);
-      document.removeEventListener('mozfullscreenchange', escFunction);
-      document.removeEventListener('fullscreenchange', escFunction);
-      document.removeEventListener('MSFullscreenChange', escFunction);
-    };
-  }, []);
-
   if (window.navigator.userAgent.indexOf('Windows') < 1) {
     return <div></div>;
   } else {
@@ -438,31 +402,11 @@ const FullScreenOpton = (props) => {
         <div
           type="primary"
           onClick={() => {
-            setshowModal(true);
+            window.open('#/popup', '_blank', 'noreferrer');
-            requestFullScreenMethod(document.body); // 进入全屏
           }}
         >
           <Icon type="alert" className="header__right-icon"></Icon>
-          {/* <IconFont
-            type="icon-line-108"
-            style={{ fontSize: "22px", color: "#333333", cursor: "pointer" }}
-          ></IconFont> */}
         </div>
-        <Modal
-          title="功能导航"
-          visible={showModal}
-          width="100%"
-          centered={true}
-          onOk={() => {
-            setshowModal(false);
-          }}
-          onCancel={() => {
-            setshowModal(false);
-          }}
-          className="fullScreen"
-        >
-          <FullScreenPage />
-        </Modal>
       </div>
     );
   }
@@ -480,6 +424,38 @@ function Header(props) {
   if (window.navigator.userAgent.indexOf('Windows') < 1) {
     isMobile = true;
   }
+  const { Menus } = props.login.loginInfo;
+  let haveTarget = false;
+  // 目标ID
+  const targetId = 'D83FBB6D-D865-D1BF-6843-0732358E5D01';
+
+  const findNodeById = (menuData, id) => {
+    const searchId = id.toLowerCase();
+
+    for (const item of menuData) {
+      // 检查当前节点
+      if (item.Node && item.Node.ID && item.Node.ID.toLowerCase() === searchId) {
+        return item;
+      }
+
+      // 递归查找子节点
+      if (item.Children && item.Children.length > 0) {
+        const found = findNodeById(item.Children, id);
+        if (found) return found;
+      }
+    }
+    return null;
+  };
+
+  // 查找目标节点
+  const targetNode = findNodeById(Menus, targetId);
+
+  // 输出查找结果
+  if (targetNode) {
+    haveTarget = true;
+  } else {
+    haveTarget = false;
+  }
 
   return (
     <div className={`header ${props.matchLogin ? 'login' : ''}`}>
@@ -503,7 +479,7 @@ function Header(props) {
       {!props.matchLogin ? (
         <div className="header__right">
           {/* <RiskFourColor/> */}
-          {/* <FullScreen /> */}
+          {haveTarget && <FullScreen />}
           {/* {window.location.host == "121.41.2.71:8001" ? <FullScreen /> : ""}  */}
           <GuideCode />
           <HeaderNav />