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

优化

Browse Source
This commit is contained in:
何美荣 2025-10-22 17:56:27 +08:00
parent c304b7f4b2
commit af4ceaf593
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/CustomPages/SK/SK033ShowPrint.js
View File

@ -69,7 +69,7 @@ class SK033ShowPrint extends React.Component {
} else { } else {
this.setState({ BtnAgreeDisplay: 'inline' }) this.setState({ BtnAgreeDisplay: 'inline' })
} }
this.onClickApprove(false); this.onClickApprove(true);
} }
else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
} }
@ -127,15 +127,15 @@ class SK033ShowPrint extends React.Component {
} }
<table style={{ tableLayout: 'fixed', width: '100%' }} className={stylesStep.PrintForm1}> <table style={{ tableLayout: 'fixed', width: '100%' }} className={stylesStep.PrintForm1}>
<tr> <tr>
<td className={stylesStep.fontBold}>序号</td> <td style={{ width: "50px" }} className={stylesStep.fontBold}>序号</td>
<td className={stylesStep.fontBold}>生产单元</td> <td style={{ width: "80px" }} className={stylesStep.fontBold}>生产单元</td>
<td className={stylesStep.fontBold}>辨识区域</td> <td style={{ width: "80px" }} className={stylesStep.fontBold}>辨识区域</td>
<td className={stylesStep.fontBold}>风险名称</td> <td style={{ width: "80px" }} className={stylesStep.fontBold}>风险名称</td>
<td className={stylesStep.fontBold}>风险描述</td> <td className={stylesStep.fontBold}>风险描述</td>
<td className={stylesStep.fontBold}>风险类别</td> <td style={{ width: "80px" }} className={stylesStep.fontBold}>风险类别</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>管控措施</td> <td className={stylesStep.fontBold}>管控措施</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>应急处置</td> <td className={stylesStep.fontBold}>应急处置</td>
<td className={stylesStep.fontBold}>状态</td> <td style={{ width: "50px" }} className={stylesStep.fontBold}>状态</td>
</tr> </tr>
{ {
data?.Nav_Details && data.Nav_Details?.map((item, i) => { data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -185,7 +185,7 @@ class SK033ShowPrint extends React.Component {
<div> <div>
<Descriptions size="middle" bordered> <Descriptions size="middle" bordered>
<Descriptions.Item label="辨识人签名">{ <Descriptions.Item label="辨识人签名">{
data.STATUS === 30 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
}</Descriptions.Item> }</Descriptions.Item>
</Descriptions> </Descriptions>
</div>:null </div>:null

36
src/files/edit/SK033.js
View File

@ -75,19 +75,33 @@ export default {
ID:guid(), ID:guid(),
MineType: item.MineType, MineType: item.MineType,
AREA_ID: item.AREA_ID, AREA_ID: item.AREA_ID,
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
TYPE_ID: item.TYPE_ID, TYPE_ID: item.TYPE_ID,
RISK_NAME_ID: item.RISK_NAME_ID, RISK_NAME_ID: item.RISK_NAME_ID,
RISK_NAME: item.RISK_NAME, RISK_NAME: item.RISK_NAME,
RISK_DESCRIPTION: item.RISK_DESCRIPTION, RISK_DESCRIPTION: item.RISK_DESCRIPTION,
MEASURE: item.MEASURE, MEASURE: item.MINE_NAME,
EMERGENCY: item.EMERGENCY, EMERGENCY: item.EMERGENCY,
Nav_Area: item.Nav_Area, Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type, Nav_Type: item.Nav_Type,
Nav_RiskName: item.Nav_RiskName, Nav_RiskName: item.Nav_RiskName,
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
MARK:0,
ENABLE_STATUS:0,
Nav_ProductionUnit: item.Nav_ProductionUnit,
} }
if(stateData && stateData.Nav_Details) if(stateData && stateData.Nav_Details)
{ {
stateData.Nav_Details.push(tmpData); let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME);
if(temp.length === 0)
{
stateData.Nav_Details.push(tmpData)
}
else
{
message.error('生产单元、辨识区域、风险名称已存在，请勿重复导入');
return;
}
} }
else else
{ {
@ -96,15 +110,15 @@ export default {
}); });
if(temps && temps.length>0) if(temps && temps.length>0)
{ {
temps.map(t=>{ let tempOlds=[]
let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == t.AREA_ID && m.MineType == t.MineType && m.RISK_NAME == t.RISK_NAME && m.RISK_DESCRIPTION == t.RISK_DESCRIPTION); temps.map(t=>{
if(temp) let temp = tempOlds.filter(m=>m.AREA_ID == t.AREA_ID && m.PRODUCTION_UNIT_ID == t.PRODUCTION_UNIT_ID && m.RISK_NAME == t.RISK_NAME);
{ if(temp.length === 0)
message.error('导入内容已存在，请核对'); {
return; tempOlds.push(t)
} }
}) })
stateData.Nav_Details = temps; stateData.Nav_Details = tempOlds;
} }
login.tempDatas =null; login.tempDatas =null;
close(); close();

6
src/files/list/SK066.js
View File

@ -18,6 +18,7 @@ export default {
MineType: item.MineType, MineType: item.MineType,
AREA_ID: item.AREA_ID, AREA_ID: item.AREA_ID,
TYPE_ID: item.TYPE_ID, TYPE_ID: item.TYPE_ID,
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
RISK_NAME_ID: item.RISK_NAME_ID, RISK_NAME_ID: item.RISK_NAME_ID,
RISK_NAME: item.RISK_NAME, RISK_NAME: item.RISK_NAME,
RISK_DESCRIPTION: item.RISK_DESCRIPTION, RISK_DESCRIPTION: item.RISK_DESCRIPTION,
@ -25,6 +26,7 @@ export default {
CHECKDEPT: item.CHECKDEPT, CHECKDEPT: item.CHECKDEPT,
CHECKPOST: item.CHECKPOST, CHECKPOST: item.CHECKPOST,
MEASURE: item.MEASURE, MEASURE: item.MEASURE,
MINE_NAME:item.MINE_NAME,
EMERGENCY: item.EMERGENCY, EMERGENCY: item.EMERGENCY,
Nav_Area: item.Nav_Area, Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type, Nav_Type: item.Nav_Type,
@ -36,6 +38,10 @@ export default {
Nav_SCOREL:item.Nav_SCOREL, Nav_SCOREL:item.Nav_SCOREL,
Nav_SCOREE:item.Nav_SCOREE, Nav_SCOREE:item.Nav_SCOREE,
Nav_SCOREC:item.Nav_SCOREC, Nav_SCOREC:item.Nav_SCOREC,
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
MARK:0,
ENABLE_STATUS:0,
Nav_ProductionUnit:item.Nav_ProductionUnit
} }
temps.push(tmpData); temps.push(tmpData);
}); });