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

Compare commits

base: wyw:0aca6273b1eaeb6a10b48d1856950698e2ef9fd6
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:3886340ee5d3ff6dc3df323725059b30a9c30088
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "0aca6273b1eaeb6a10b48d1856950698e2ef9fd6" and "3886340ee5d3ff6dc3df323725059b30a9c30088" have entirely different histories.
0aca6273b1 ... 3886340ee5

12 changed files with 6 additions and 64 deletions
Show Stats Expand all files Collapse all files

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

@ -151,7 +151,6 @@ class SK010ShowPrint extends React.Component {
<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>
</tr>
{
@ -228,11 +227,6 @@ class SK010ShowPrint extends React.Component {
})
}
</td>
<td>
{
item.REMARK
}
</td>
<td>
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)

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

@ -172,7 +172,6 @@ class SK012ShowPrint extends React.Component {
<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>
</tr>
{
@ -249,11 +248,6 @@ class SK012ShowPrint extends React.Component {
})
}
</td>
<td>
{
item.REMARK
}
</td>
<td>
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)

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

@ -149,7 +149,6 @@ class SK014ShowPrint extends React.Component {
<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>
</tr>
{
@ -208,11 +207,6 @@ class SK014ShowPrint extends React.Component {
moment(item.RECITIFY_TIME).format('YYYY-MM-DD')
}
</td>
<td>
{
item.REMARK
}
</td>
<td>
{
showFiles(item?.Nav_ReportDetailFiles, config.picServerHost, this)

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

@ -176,7 +176,7 @@ class SK018ShowPrint extends React.Component {
<Descriptions.Item label="附件">{
showFiles(data?.Nav_Files, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item>
{/* <Descriptions.Item label="是否入库">{enums.SKIsStoreEnum.enums[data.IS_STORE]}</Descriptions.Item> */}
</Descriptions>
</div> : null
}

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

@ -151,7 +151,6 @@ class SK020ShowPrint extends React.Component {
<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>
{
@ -215,11 +214,6 @@ class SK020ShowPrint extends React.Component {
item.Nav_AcceptUser?.NAME
}
</td>
<td>
{
item.REMARK
}
</td>
<td>
{
showFiles(item?.Nav_RectifyDetailFiles, config.picServerHost, this)

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

@ -176,7 +176,6 @@ 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>
</div> : null
}

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

@ -134,8 +134,7 @@ class SK033ShowPrint extends React.Component {
<td style={{ width: "80px" }} 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: "80px" }} className={stylesStep.fontBold}>是否有效</td>
<td style={{ width: "50px" }} className={stylesStep.fontBold}>状态</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -173,9 +172,6 @@ class SK033ShowPrint extends React.Component {
// })
}
</td>
<td>
{enums.SKMarkEnum.enums[item.MARK]}
</td>
<td>
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
</td>

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

@ -130,8 +130,7 @@ class SK035ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>辨识岗位</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>管控措施</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>应急处置</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>新增标识</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>是否有效</td>
<td className={stylesStep.fontBold}>状态</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -189,9 +188,6 @@ class SK035ShowPrint extends React.Component {
// })
}
</td>
<td>
{enums.SKMarkEnum.enums[item.MARK]}
</td>
<td>
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
</td>

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

@ -131,8 +131,7 @@ class SK037ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>辨识岗位</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>管控措施</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>应急处置</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>新增标识</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>是否有效</td>
<td className={stylesStep.fontBold}>状态</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -190,9 +189,6 @@ class SK037ShowPrint extends React.Component {
// })
}
</td>
<td>
{enums.SKMarkEnum.enums[item.MARK]}
</td>
<td>
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
</td>

10
src/components/CustomPages/SK/SK039ShowPrint.js
View File

@ -136,8 +136,6 @@ class SK039ShowPrint extends React.Component {
<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: "80px" }} className={stylesStep.fontBold}>是否有效</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -211,16 +209,10 @@ class SK039ShowPrint extends React.Component {
{
//item.IDENTIFY_USER
item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => {
return <tr> {item2?.Nav_Department?.Nav_User?.NAME}</tr>
return <tr> {item2?.Nav_User?.NAME}</tr>
})
}
</td>
<td>
{enums.SKMarkEnum.enums[item.MARK]}
</td>
<td>
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
</td>
</tr>
})
}

10
src/components/CustomPages/SK/SK041ShowPrint.js
View File

@ -136,8 +136,6 @@ class SK041ShowPrint extends React.Component {
<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: "80px" }} className={stylesStep.fontBold}>是否有效</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -211,16 +209,10 @@ class SK041ShowPrint extends React.Component {
{
//item.IDENTIFY_USER
item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => {
return <tr> {item2?.Nav_Department?.Nav_User?.NAME}</tr>
return <tr> {item2?.Nav_User?.NAME}</tr>
})
}
</td>
<td>
{enums.SKMarkEnum.enums[item.MARK]}
</td>
<td>
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
</td>
</tr>
})
}

5
src/files/edit/SK035.js
View File

@ -2,7 +2,6 @@ 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}
*/
@ -52,10 +51,6 @@ 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)
{