wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wyw 2026-07-14 15:58:58 +08:00
commit 95fed5ae63
10 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/CustomPages/BI/BI001HomeDetail.js
View File

@ -35,7 +35,7 @@ class BI001HomeDetail extends React.Component {
// render: (text, record, index) => `${index + 1}`
// },
{
title: "车间",
title: "上级组织",
dataIndex: "shopName",
render: (value, record, index) => {
const obj = {
@ -145,7 +145,7 @@ class BI001HomeDetail extends React.Component {
},
},
{
title: "班组",
title: "发起组织",
dataIndex: "teamName",
onCell:()=>this.renderSpeedColumn()
},
@ -249,7 +249,7 @@ class BI001HomeDetail extends React.Component {
}
},
title: {
text: "班组活动任务完成走势图",
text: "班组建设任务完成走势图",
left: "center",
top: "5%",
},

4
src/components/CustomPages/BI/BI002HomeDetail.js
View File

@ -35,7 +35,7 @@ class BI002HomeDetail extends React.Component {
// render: (text, record, index) => `${index + 1}`
// },
{
title: "车间",
title: "上级组织",
dataIndex: "shopName",
render: (value, record, index) => {
const obj = {
@ -145,7 +145,7 @@ class BI002HomeDetail extends React.Component {
},
},
{
title: "班组",
title: "发起组织",
dataIndex: "teamName",
onCell:()=>this.renderSpeedColumn()
},

6
src/components/CustomPages/SK/SK010ShowPrint.js
View File

@ -148,6 +148,7 @@ class SK010ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>检查人员</td>
<td width='10%' className={stylesStep.fontBold}>检查情况</td>
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患具体描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
@ -208,6 +209,11 @@ class SK010ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
</td>
<td>
{
item.HIDDEN_DESCRIPTION
}
</td>
<td>
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]

6
src/components/CustomPages/SK/SK012ShowPrint.js
View File

@ -169,6 +169,7 @@ class SK012ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>检查人员</td>
<td width='10%' className={stylesStep.fontBold}>检查情况</td>
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患具体描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
@ -229,6 +230,11 @@ class SK012ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
</td>
<td>
{
item.HIDDEN_DESCRIPTION
}
</td>
<td>
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]

14
src/components/CustomPages/SK/SK014ShowPrint.js
View File

@ -144,12 +144,14 @@ class SK014ShowPrint extends React.Component {
<td width='10%' className={stylesStep.fontBold}>检查区域</td>
<td className={stylesStep.fontBold}>检查内容</td>
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患具体描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td width='10%' className={stylesStep.fontBold}>整改责任人</td>
<td width='10%' className={stylesStep.fontBold}>整改期限</td>
<td className={stylesStep.fontBold}>备注</td>
<td className={stylesStep.fontBold}>整改措施</td>
<td className={stylesStep.fontBold}>整改措施具体描述</td>
<td className={stylesStep.fontBold}>隐患照片</td>
</tr>
{
@ -174,6 +176,11 @@ class SK014ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
</td>
<td>
{
item.HIDDEN_DESCRIPTION
}
</td>
<td>
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
@ -208,6 +215,11 @@ class SK014ShowPrint extends React.Component {
moment(item.RECITIFY_TIME).format('YYYY-MM-DD')
}
</td>
<td>
{
item.Nav_Question?.DEMAND
}
</td>
<td>
{
item.REMARK

4
src/components/CustomPages/SK/SK018ShowPrint.js
View File

@ -156,8 +156,10 @@ class SK018ShowPrint extends React.Component {
}</Descriptions.Item> */}
{/* <Descriptions.Item label="判定标准">{data.CHECKSTANDARD}</Descriptions.Item> */}
<Descriptions.Item label="系统隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
<Descriptions.Item label="隐患具体描述">{data.HIDDEN_DESCRIPTION_DETAIL}</Descriptions.Item>
<Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.Nav_Question?.DEMAND}</Descriptions.Item>
<Descriptions.Item label="整改措施具体描述">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
<Descriptions.Item label="隐患原因">{
data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => {

17
src/components/CustomPages/SK/SK020ShowPrint.js
View File

@ -144,15 +144,18 @@ class SK020ShowPrint extends React.Component {
<td width='10%' className={stylesStep.fontBold}>检查区域</td>
{/* <td className={stylesStep.fontBold}>检查内容</td> */}
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患具体描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td width='10%' className={stylesStep.fontBold}>整改措施</td>
<td className={stylesStep.fontBold}>整改措施</td>
<td className={stylesStep.fontBold}>整改措施具体描述</td>
<td width='10%' className={stylesStep.fontBold}>整改期限</td>
<td width='10%' className={stylesStep.fontBold}>整改落实人</td>
<td width='10%' className={stylesStep.fontBold}>验收人</td>
<td className={stylesStep.fontBold}>备注</td>
<td className={stylesStep.fontBold}>隐患照片</td>
</tr>
{
data?.Nav_RectifyDetails && data.Nav_RectifyDetails?.map((item, i) => {
@ -172,7 +175,12 @@ class SK020ShowPrint extends React.Component {
</td> */}
<td>
{
item.Nav_Question?.DESCREPTION ? item.Nav_Question.DESCREPTION : item.HIDDEN_DESCRIPTION
item.Nav_Question?.DESCREPTION
}
</td>
<td>
{
item.HIDDEN_DESCRIPTION
}
</td>
<td>
@ -195,6 +203,11 @@ class SK020ShowPrint extends React.Component {
})
}
</td>
<td>
{
item.Nav_Question?.DEMAND
}
</td>
<td>
{
item.RECTIFICATION_MEASURES

8
src/components/CustomPages/SK/SK022ShowPrint.js
View File

@ -139,9 +139,11 @@ class SK022ShowPrint extends React.Component {
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}</Descriptions.Item>
<Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION ? data.Nav_Question.DESCREPTION : data.HIDDEN_DESCRIPTION}</Descriptions.Item>
<Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
<Descriptions.Item label="隐患具体描述">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
<Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.Nav_Question?.DEMAND}</Descriptions.Item>
<Descriptions.Item label="整改措施具体描述">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
<Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
<Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
@ -176,7 +178,7 @@ class SK022ShowPrint extends React.Component {
showUserSign(data.Nav_AcceptUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}</Descriptions.Item>
<Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item>
{/* <Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item> */}
</Descriptions>
</div> : null
}

1
src/components/MainPage/SafeCheck.js
View File

@ -104,6 +104,7 @@ class SafeCheck extends Component {
},
},
legend: {
show: false,
data: seriesName,
left: "center",
align: "left",

4
src/routes/Home.js
View File

@ -1348,7 +1348,7 @@ class Home extends React.Component {
} else if (formCode == 'BI055_HOMEDETAIL') {
titleTemp += '月度隐患整改情况（近12月）';
} else if (formCode == 'BI001_HOMEDETAIL') {
titleTemp += '班组活动任务完成详情（近12月）';
titleTemp += '班组建设任务完成详情（近12月）';
} else if (formCode == 'BI002_HOMEDETAIL') {
titleTemp += '工作票完成详情（近12月）';
} else if (formCode == 'BI013_RISKANALYSISMODEL') {
@ -2022,7 +2022,7 @@ class Home extends React.Component {
<div className="statistical-title-style">
<div className="badge-style">
<Icon type="bar-chart" style={{ color: '#5f6ac2', marginRight: '4px' }}></Icon>
班组活动完成率
班组建设完成率
</div>
{this.state.departmentCompletionData.length > 0 ? (
<span