ccy/mh-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

Browse Source
This commit is contained in:
yunkexin 2024-04-24 14:56:36 +08:00
commit b94b8e9bcc
4 changed files with 1100 additions and 813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1901
src/components/CustomPages/BI/BI007FormRunAnalysisNew.js
View File

File diff suppressed because it is too large Load Diff

2
src/components/CustomPages/BS/BS006View.js
View File

@ -121,7 +121,7 @@ class BS006View extends React.Component {
data ? <div > data ? <div >
<Descriptions title="" size="middle" bordered> <Descriptions title="" size="middle" bordered>
<Descriptions.Item label="编码">{data.CODE}</Descriptions.Item> <Descriptions.Item label="编码">{data.CODE}</Descriptions.Item>
<Descriptions.Item label="隐患上报名称">{data.NAME}</Descriptions.Item> <Descriptions.Item label="隐患来源">{data.NAME}</Descriptions.Item>
<Descriptions.Item label="检查任务">{data.Nav_Check != null ? data.Nav_Check.NAME : ""}</Descriptions.Item> <Descriptions.Item label="检查任务">{data.Nav_Check != null ? data.Nav_Check.NAME : ""}</Descriptions.Item>
<Descriptions.Item label="检查类型">{data.Nav_CheckType != null ? data.Nav_CheckType.NAME : ""}</Descriptions.Item> <Descriptions.Item label="检查类型">{data.Nav_CheckType != null ? data.Nav_CheckType.NAME : ""}</Descriptions.Item>
<Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel != null ? data.Nav_CheckTypeLevel.Nav_Enums.NAME : ""}</Descriptions.Item> <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel != null ? data.Nav_CheckTypeLevel.Nav_Enums.NAME : ""}</Descriptions.Item>

8
src/components/CustomPages/CM/CM002ShowPrint.js
View File

@ -56,7 +56,7 @@ class CM002ShowPrint extends React.Component {
extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_Department')
extendInclude(json, 'Nav_listPlanDetail.Nav_Department') extendInclude(json, 'Nav_listPlanDetail.Nav_Department')
extendInclude(json, 'Nav_listPlanDetail.Nav_User') extendInclude(json, 'Nav_listPlanDetail.Nav_User')
extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate') // extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate')
extendIgnoreDataRule(json) extendIgnoreDataRule(json)
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
@ -119,7 +119,7 @@ class CM002ShowPrint extends React.Component {
<tr className={styles.PrintFormLightTh}> <tr className={styles.PrintFormLightTh}>
<td>应急演练时间</td> <td>应急演练时间</td>
<td>应急演练名称</td> <td>应急演练名称</td>
<td>关联应急预案</td> {/* <td>关联应急预案</td> */}
<td>组织演练部门</td> <td>组织演练部门</td>
<td>责任人</td> <td>责任人</td>
<td>演练方案触发时间</td> <td>演练方案触发时间</td>
@ -128,11 +128,11 @@ class CM002ShowPrint extends React.Component {
return <tr> return <tr>
<td>{item.DRLL_DATE?.substring(0, 7)} </td> <td>{item.DRLL_DATE?.substring(0, 7)} </td>
<td>{item.NAME} </td> <td>{item.NAME} </td>
<td>{ {/* <td>{
item.Nav_ListStandard?.map((itmc, j) => { item.Nav_ListStandard?.map((itmc, j) => {
return (j > 0 ? "，" : "") + itmc.Nav_StandardCreate.NAME return (j > 0 ? "，" : "") + itmc.Nav_StandardCreate.NAME
}) })
} </td> } </td> */}
<td>{item.Nav_Department?.NAME} </td> <td>{item.Nav_Department?.NAME} </td>
<td>{item.Nav_User?.NAME} </td> <td>{item.Nav_User?.NAME} </td>
<td>{item.TRIGGER_TIME?.split(' ')[0]} </td> <td>{item.TRIGGER_TIME?.split(' ')[0]} </td>

2
src/components/CustomPages/CM/CM034ShowPrint.js
View File

@ -61,6 +61,7 @@ class CM034ShowPrint extends React.Component {
extendInclude(json, 'Nav_ListDepartment.Nav_Department') extendInclude(json, 'Nav_ListDepartment.Nav_Department')
extendInclude(json, 'Nav_FilesSummary.Nav_ImgFile.Nav_File') extendInclude(json, 'Nav_FilesSummary.Nav_ImgFile.Nav_File')
extendInclude(json, 'Nav_FilesRecord.Nav_ImgFile.Nav_File') extendInclude(json, 'Nav_FilesRecord.Nav_ImgFile.Nav_File')
extendInclude(json, 'Nav_FilesStander.Nav_ImgFile.Nav_File')
extendInclude(json, 'Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
@ -131,6 +132,7 @@ class CM034ShowPrint extends React.Component {
})}</Descriptions.Item> })}</Descriptions.Item>
<Descriptions.Item label="演练总结报告">{showFiles(data.Nav_FilesSummary, config.picServerHost)}</Descriptions.Item> <Descriptions.Item label="演练总结报告">{showFiles(data.Nav_FilesSummary, config.picServerHost)}</Descriptions.Item>
<Descriptions.Item label="演练活动记录">{showFiles(data.Nav_FilesRecord, config.picServerHost)}</Descriptions.Item> <Descriptions.Item label="演练活动记录">{showFiles(data.Nav_FilesRecord, config.picServerHost)}</Descriptions.Item>
<Descriptions.Item span={3} label="应急预案">{showFiles(data.Nav_FilesStander, config.picServerHost)}</Descriptions.Item>
{ {
data.STATUS >= 10 ? data.STATUS >= 10 ?
<Descriptions.Item label="审核意见" span={3}>{ <Descriptions.Item label="审核意见" span={3}>{