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 1/3] =?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 2/3] 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({ From 55506af12fad5cad0492a0ec287a626ec7b33185 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: Tue, 9 Jun 2026 16:43:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SK/SK010ShowPrint.js | 6 ++++++ src/components/CustomPages/SK/SK012ShowPrint.js | 6 ++++++ src/components/CustomPages/SK/SK014ShowPrint.js | 6 ++++++ src/components/CustomPages/SK/SK018ShowPrint.js | 2 +- src/components/CustomPages/SK/SK020ShowPrint.js | 6 ++++++ src/components/CustomPages/SK/SK022ShowPrint.js | 1 + src/components/CustomPages/SK/SK033ShowPrint.js | 6 +++++- src/components/CustomPages/SK/SK035ShowPrint.js | 6 +++++- src/components/CustomPages/SK/SK037ShowPrint.js | 6 +++++- src/components/CustomPages/SK/SK039ShowPrint.js | 10 +++++++++- src/components/CustomPages/SK/SK041ShowPrint.js | 10 +++++++++- src/files/edit/SK035.js | 5 +++++ 12 files changed, 64 insertions(+), 6 deletions(-) diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js index 91e4ca8..9cc591c 100644 --- a/src/components/CustomPages/SK/SK010ShowPrint.js +++ b/src/components/CustomPages/SK/SK010ShowPrint.js @@ -151,6 +151,7 @@ class SK010ShowPrint extends React.Component { 隐患等级 隐患地点 隐患原因 + 备注 隐患照片 { @@ -227,6 +228,11 @@ class SK010ShowPrint extends React.Component { }) } + + { + item.REMARK + } + { showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this) diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js index 8f5dcb6..817d4b7 100644 --- a/src/components/CustomPages/SK/SK012ShowPrint.js +++ b/src/components/CustomPages/SK/SK012ShowPrint.js @@ -172,6 +172,7 @@ class SK012ShowPrint extends React.Component { 隐患等级 隐患地点 隐患原因 + 备注 隐患照片 { @@ -248,6 +249,11 @@ class SK012ShowPrint extends React.Component { }) } + + { + item.REMARK + } + { showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this) diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js index abc2ba8..ffb0330 100644 --- a/src/components/CustomPages/SK/SK014ShowPrint.js +++ b/src/components/CustomPages/SK/SK014ShowPrint.js @@ -149,6 +149,7 @@ class SK014ShowPrint extends React.Component { 隐患原因 整改责任人 整改期限 + 备注 隐患照片 { @@ -207,6 +208,11 @@ class SK014ShowPrint extends React.Component { moment(item.RECITIFY_TIME).format('YYYY-MM-DD') } + + { + item.REMARK + } + { showFiles(item?.Nav_ReportDetailFiles, config.picServerHost, this) diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js index 9ea02c3..c6b15ea 100644 --- a/src/components/CustomPages/SK/SK018ShowPrint.js +++ b/src/components/CustomPages/SK/SK018ShowPrint.js @@ -176,7 +176,7 @@ class SK018ShowPrint extends React.Component { { showFiles(data?.Nav_Files, config.picServerHost, this) } - {/* {enums.SKIsStoreEnum.enums[data.IS_STORE]} */} + {data.REMARK}
: null } diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js index 4368e10..347007b 100644 --- a/src/components/CustomPages/SK/SK020ShowPrint.js +++ b/src/components/CustomPages/SK/SK020ShowPrint.js @@ -151,6 +151,7 @@ class SK020ShowPrint extends React.Component { 整改期限 整改落实人 验收人 + 备注 隐患照片 { @@ -214,6 +215,11 @@ class SK020ShowPrint extends React.Component { item.Nav_AcceptUser?.NAME } + + { + item.REMARK + } + { showFiles(item?.Nav_RectifyDetailFiles, config.picServerHost, this) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 2dbd29b..b36637c 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -176,6 +176,7 @@ class SK022ShowPrint extends React.Component { showUserSign(data.Nav_AcceptUser, config.picServerHost) : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : '' } + {data.REMARK} : null } diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index a250c49..e2c1718 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -134,7 +134,8 @@ class SK033ShowPrint extends React.Component { 风险类别 管控措施 应急处置 - 状态 + 新增标识 + 是否有效 { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -172,6 +173,9 @@ class SK033ShowPrint extends React.Component { // }) } + + {enums.SKMarkEnum.enums[item.MARK]} + {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]} diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js index 798638a..46cad7a 100644 --- a/src/components/CustomPages/SK/SK035ShowPrint.js +++ b/src/components/CustomPages/SK/SK035ShowPrint.js @@ -130,7 +130,8 @@ class SK035ShowPrint extends React.Component { 辨识岗位 管控措施 应急处置 - 状态 + 新增标识 + 是否有效 { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -188,6 +189,9 @@ class SK035ShowPrint extends React.Component { // }) } + + {enums.SKMarkEnum.enums[item.MARK]} + {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]} diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js index efc41a6..4918b9f 100644 --- a/src/components/CustomPages/SK/SK037ShowPrint.js +++ b/src/components/CustomPages/SK/SK037ShowPrint.js @@ -131,7 +131,8 @@ class SK037ShowPrint extends React.Component { 辨识岗位 管控措施 应急处置 - 状态 + 新增标识 + 是否有效 { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -189,6 +190,9 @@ class SK037ShowPrint extends React.Component { // }) } + + {enums.SKMarkEnum.enums[item.MARK]} + {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]} diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js index 46eecd8..3c8df6d 100644 --- a/src/components/CustomPages/SK/SK039ShowPrint.js +++ b/src/components/CustomPages/SK/SK039ShowPrint.js @@ -136,6 +136,8 @@ class SK039ShowPrint extends React.Component { 管控层级 管控部门 管控责任人 + 新增标识 + 是否有效 { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -209,10 +211,16 @@ class SK039ShowPrint extends React.Component { { //item.IDENTIFY_USER item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => { - return {item2?.Nav_User?.NAME} + return {item2?.Nav_Department?.Nav_User?.NAME} }) } + + {enums.SKMarkEnum.enums[item.MARK]} + + + {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]} + }) } diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js index c5314e0..dc75c39 100644 --- a/src/components/CustomPages/SK/SK041ShowPrint.js +++ b/src/components/CustomPages/SK/SK041ShowPrint.js @@ -136,6 +136,8 @@ class SK041ShowPrint extends React.Component { 管控层级 管控部门 管控责任人 + 新增标识 + 是否有效 { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -209,10 +211,16 @@ class SK041ShowPrint extends React.Component { { //item.IDENTIFY_USER item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => { - return {item2?.Nav_User?.NAME} + return {item2?.Nav_Department?.Nav_User?.NAME} }) } + + {enums.SKMarkEnum.enums[item.MARK]} + + + {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]} + }) } diff --git a/src/files/edit/SK035.js b/src/files/edit/SK035.js index 9eb4685..9f1e297 100644 --- a/src/files/edit/SK035.js +++ b/src/files/edit/SK035.js @@ -2,6 +2,7 @@ import { message } from "antd/lib/index"; import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common"; import moment from 'moment'; import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd'; +import Item from "antd/lib/list/Item"; /** * @return {string} */ @@ -51,6 +52,10 @@ export default { Nav_Area: item.Nav_Area, Nav_Type: item.Nav_Type, Nav_RiskName: item.Nav_RiskName, + PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID, + Nav_ProductionUnit:item.Nav_ProductionUnit, + MARK:item.MARK, + ENABLE_STATUS:item.ENABLE_STATUS, } if(stateData && stateData.Nav_Details) {