From 319e5415b678374e3ab7a5d99d625eb1e4346914 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 11:08:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/BI/BI064FormRunAnalysis.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/CustomPages/BI/BI064FormRunAnalysis.js b/src/components/CustomPages/BI/BI064FormRunAnalysis.js index 8902ed2..d1b5923 100644 --- a/src/components/CustomPages/BI/BI064FormRunAnalysis.js +++ b/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=()=>{ 系统运行情况统计分析 - + { /> - + Date: Mon, 25 May 2026 15:27:52 +0800 Subject: [PATCH 2/5] 1 --- src/layout/FullScreenInter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layout/FullScreenInter.js b/src/layout/FullScreenInter.js index 3be5407..33b4e99 100644 --- a/src/layout/FullScreenInter.js +++ b/src/layout/FullScreenInter.js @@ -607,8 +607,8 @@ 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.Parameter2 = this.state.selectedEndDate.format('YYYY-MM-DD'); + 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, From 8d7755cbf480c6346e65c31ee422b5ddc4c1dc56 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 25 May 2026 16:55:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/Header.js | 92 ++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/src/layout/Header.js b/src/layout/Header.js index 9a23bc3..df25439 100644 --- a/src/layout/Header.js +++ b/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
; } else { @@ -438,31 +402,11 @@ const FullScreenOpton = (props) => {
{ - setshowModal(true); - requestFullScreenMethod(document.body); // 进入全屏 + window.open('#/popup', '_blank', 'noreferrer'); }} > - {/* */}
- { - setshowModal(false); - }} - onCancel={() => { - setshowModal(false); - }} - className="fullScreen" - > - - ); } @@ -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 (
@@ -503,7 +479,7 @@ function Header(props) { {!props.matchLogin ? (
{/* */} - {/* */} + {haveTarget && } {/* {window.location.host == "121.41.2.71:8001" ? : ""} */} 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 4/5] =?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, }); } From 86fb04f52e7b1162cd97ccd31f4a47bed7ff7748 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 26 May 2026 08:45:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=B9=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/FullOther/HomeContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/FullOther/HomeContent.js b/src/layout/FullOther/HomeContent.js index 4c5d5d9..8a3bd4d 100644 --- a/src/layout/FullOther/HomeContent.js +++ b/src/layout/FullOther/HomeContent.js @@ -991,7 +991,7 @@ class HomeContent extends React.Component {
生产规模
- {trainingData?.SumSubMode || '-'}吨/年 + {trainingData?.SumSubMode || '-'}万吨/年