From 87bae443104d8fcfa6ef3529b1f3500d5f3b9713 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 8 Jun 2026 11:44:25 +0800 Subject: [PATCH 1/4] 213 --- src/routes/Home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/Home.js b/src/routes/Home.js index 189eaf7..8229e1e 100644 --- a/src/routes/Home.js +++ b/src/routes/Home.js @@ -448,7 +448,7 @@ class Home extends React.Component { }); this.getTeam(); this.getHomeTitle(); - //定时器功能，暂时不开启 + //定时器功能，暂时不开启？？2分钟刷一次 this.timerID = setInterval(() => { if (this._isMounted) { this.getBaseInfoData(1, this.state.tableKey, 5); From ade4e83da815aa1672009bc86e51c3e9b481432e Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 8 Jun 2026 14:21:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=20?= =?UTF-8?q?=E5=AE=A1=E9=98=85=E4=BA=BA=E4=BF=A1=E6=81=AF=20=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SE/SE018EditPage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index b5b6c8f..cd061fd 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -345,8 +345,7 @@ class SE018EditPage extends React.Component { 审阅意见 { data && data.STATUS > 2 && data.DT_APPROVE ? -

审阅人：{showUserSign(data.Nav_UserApro, config.picServerHost)}

-

审阅时间：{data.DT_APPROVE}

+

{showUserSign(data.Nav_UserApro, config.picServerHost)} {data.DT_APPROVE}

: } From 670f2bf231e1d72cbf6c95c1a37a98b48a34e859 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 8 Jun 2026 15:20:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E8=AE=A1=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/FullOther/RiskControl.js | 304 ++++++++++++++++++++-------- 1 file changed, 222 insertions(+), 82 deletions(-) diff --git a/src/layout/FullOther/RiskControl.js b/src/layout/FullOther/RiskControl.js index f07baae..6dee6d4 100644 --- a/src/layout/FullOther/RiskControl.js +++ b/src/layout/FullOther/RiskControl.js @@ -46,7 +46,7 @@ class RiskControl extends React.Component { this.echartsInstances.stackBarChart = echarts.init(chartDom); const { riskSubData } = this.props; - const riskList = riskSubData?.riskList || []; + const riskList = riskSubData?.riskList.filter((item) => item.companyName !== '小计') || []; if (riskList.length === 0) { this.echartsInstances.stackBarChart.setOption({ @@ -324,6 +324,8 @@ class RiskControl extends React.Component { this.setupResizeHandler('typeBarChart', this.renderTypeBarChart); }; + // 表格: 各公司风险统计明细表 + // 表格: 各公司风险统计明细表 // 表格: 各公司风险统计明细表 renderRiskTable = () => { const { riskSubData } = this.props; @@ -333,100 +335,238 @@ class RiskControl extends React.Component { return
暂无风险数据
; } - // 表格列配置（与 trainingContent 样式保持一致） - const columns = [ - { - title: '公司名称', - dataIndex: 'companyName', - key: 'companyName', - align: 'center', - width: 120, - render: (text) => {text}, - }, - { - title: '重大风险', - dataIndex: 'majorCount', - key: 'majorCount', - align: 'center', - width: 100, - render: (text) => {text}, - }, - { - title: '较大风险', - dataIndex: 'largerCount', - key: 'largerCount', - align: 'center', - width: 100, - render: (text) => {text}, - }, - { - title: '一般风险', - dataIndex: 'generalCount', - key: 'generalCount', - align: 'center', - width: 100, - render: (text) => {text}, - }, - { - title: '低风险', - dataIndex: 'lowCount', - key: 'lowCount', - align: 'center', - width: 100, - render: (text) => {text}, - }, - { - title: '小计', - dataIndex: 'totalCount', - key: 'totalCount', - align: 'center', - width: 100, - render: (text) => {text}, - }, - ]; + const filteredRiskList = riskList.filter((item) => item.companyName !== '小计'); - const tableData = riskList.map((item, index) => ({ - key: index, - companyName: item.companyName, - majorCount: item.majorCount, - largerCount: item.largerCount, - generalCount: item.generalCount, - lowCount: item.lowCount, - totalCount: item.totalCount, - })); - - // 合计行 const summary = { - majorTotal: riskList.reduce((sum, item) => sum + (item.majorCount || 0), 0), - largerTotal: riskList.reduce((sum, item) => sum + (item.largerCount || 0), 0), - generalTotal: riskList.reduce((sum, item) => sum + (item.generalCount || 0), 0), - lowTotal: riskList.reduce((sum, item) => sum + (item.lowCount || 0), 0), - totalAll: riskList.reduce((sum, item) => sum + (item.totalCount || 0), 0), + majorTotal: filteredRiskList.reduce((sum, item) => sum + (item.majorCount || 0), 0), + largerTotal: filteredRiskList.reduce((sum, item) => sum + (item.largerCount || 0), 0), + generalTotal: filteredRiskList.reduce((sum, item) => sum + (item.generalCount || 0), 0), + lowTotal: filteredRiskList.reduce((sum, item) => sum + (item.lowCount || 0), 0), + totalAll: filteredRiskList.reduce((sum, item) => sum + (item.totalCount || 0), 0), }; - const scrollConfig = columns.length > 10 ? { x: columns.length * 100, y: 360 } : { y: 360 }; + + const totalWidth = 620; + return ( -
+
各家公司的风险统计情况
-
- + + {/* 表格滚动区域 */} +
+
+ {/* 表头 - 使用 sticky 固定 */} + + + + + + + + + + + + + {filteredRiskList.map((item, index) => ( + + + + + + + + + ))} + + + {/* 合计行 - 使用 sticky 固定在底部 */} + + + + + + + + + + +
+ 公司名称 + + 重大风险 + + 较大风险 + + 一般风险 + + 低风险 + + 小计 +
+ {item.companyName} + + {item.majorCount} + + {item.largerCount} + + {item.generalCount} + + {item.lowCount} + + {item.totalCount} +
+ 合计 + + {summary.majorTotal} + + {summary.largerTotal} + + {summary.generalTotal} + + {summary.lowTotal} + + {summary.totalAll} +
); From 3886340ee5d3ff6dc3df323725059b30a9c30088 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 9 Jun 2026 14:48:34 +0800 Subject: [PATCH 4/4] 1 --- src/layout/FullOther/RiskControl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/FullOther/RiskControl.js b/src/layout/FullOther/RiskControl.js index 6dee6d4..f8cbc16 100644 --- a/src/layout/FullOther/RiskControl.js +++ b/src/layout/FullOther/RiskControl.js @@ -46,7 +46,7 @@ class RiskControl extends React.Component { this.echartsInstances.stackBarChart = echarts.init(chartDom); const { riskSubData } = this.props; - const riskList = riskSubData?.riskList.filter((item) => item.companyName !== '小计') || []; + const riskList = riskSubData?.riskList?.filter((item) => item.companyName !== '小计') || []; if (riskList.length === 0) { this.echartsInstances.stackBarChart.setOption({