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 2025-10-23 10:59:23 +08:00
commit 0401f7e0b4
15 changed files with 187 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/CustomPages/SK/SK002CheckList.js
View File

@ -76,8 +76,28 @@ class SK002CheckList extends React.Component {
dataIndex: "DEPARTMENT_TYPE",
key: "DEPARTMENT_TYPE",
render: (text, record, index) => {
if(record.DEPARTMENT_TYPE.includes('_'))
{
let departTypeLists=[]
let departTypes=record.DEPARTMENT_TYPE.split('_')
if(departTypes.length>0)
{
for(let i=0;i<departTypes.length;i++)
{
if(departTypes[i])
{
let type=this.props.app.enums.SKDepartmentTypeEnum.enums[departTypes[i]]
departTypeLists.push(" "+type)
}
}
}
return <label>{departTypeLists}</label>
}
else
{
return <label>{this.props.app.enums.SKDepartmentTypeEnum.enums[record.DEPARTMENT_TYPE]}</label>
}
}
},
],
};
@ -221,7 +241,7 @@ class SK002CheckList extends React.Component {
<div>
<h1 style={{ textAlign: 'center', margin: '15px' }}>基础库</h1>
<br></br>
<Row style={{width:"1250px",margin:"auto"}}>
<Row style={{width:"100%",margin:"auto"}}>
<Col span={5}>
<Form.Item
label={'生产单元'}
@ -250,12 +270,12 @@ class SK002CheckList extends React.Component {
<Col span={1} style={{ marginLeft: "20px" }}><Button type='primary' onClick={() => this.loadData2()}>查询</Button></Col>
</Row>
<br></br>
<div style={{ width:"1250px",margin:"auto",alignContent:"left"}}>
<div style={{ width:"100%",margin:"auto",alignContent:"left"}}>
<Button type='primary' onClick={() => this.closeTasks()} icon="export">导入</Button>
</div>
<br></br>
{this.state.dataList?
<Table style={{ width:"1250px",margin:"auto",alignContent:"center",backgroundColor:"white"}}
<Table style={{ width:"100%",margin:"auto",alignContent:"center",backgroundColor:"white"}}
dataSource={this.state.dataList}
columns={this.state.columns}
rowSelection={rowSelection}

36
src/components/CustomPages/SK/SK002ShowPrint.js
View File

@ -44,24 +44,24 @@ class SK002ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',
dataIndex: '',

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

@ -94,8 +94,8 @@ class SK002ShowSummary extends React.Component {
<td className={stylesStep.fontBold}>管控层级</td>
<td className={stylesStep.fontBold}>管控措施</td>
<td className={stylesStep.fontBold}>检查内容</td>
<td className={stylesStep.fontBold}>检查依据</td>
<td className={stylesStep.fontBold}>判定标准</td>
{/* <td className={stylesStep.fontBold}>检查依据</td>
<td className={stylesStep.fontBold}>判定标准</td> */}
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患等级</td>
<td className={stylesStep.fontBold}>整改措施</td>
@ -157,12 +157,12 @@ class SK002ShowSummary extends React.Component {
<td>
{ item.CHECKCONTENTS}
</td>
<td>
{/* <td>
{item.CHECKBASICS }
</td>
<td>
{ item.CHECKSTANDARDS }
</td>
</td> */}
<td>
{ item.HIDDENSCRIPTION }
</td>

36
src/components/CustomPages/SK/SK004CheckList.js
View File

@ -53,24 +53,24 @@ class SK004CheckList extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
],
columns : [

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

@ -55,16 +55,16 @@ class SK004CheckListNew extends React.Component {
dataIndex: "CHECK_CONTENTS_NAME",
key: "CHECK_CONTENTS_NAME",
},
{
title: "检查依据",
dataIndex: "CHECKPROOF",
key: "CHECKPROOF",
},
{
title: "判定标准",
dataIndex: "CHECKSTANDARD",
key: "CHECKSTANDARD",
},
// {
// title: "检查依据",
// dataIndex: "CHECKPROOF",
// key: "CHECKPROOF",
// },
// {
// title: "判定标准",
// dataIndex: "CHECKSTANDARD",
// key: "CHECKSTANDARD",
// },
],

36
src/components/CustomPages/SK/SK004ShowPrint.js
View File

@ -46,24 +46,24 @@ class SK004ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',
dataIndex: '',

36
src/components/CustomPages/SK/SK010CheckList.js
View File

@ -44,24 +44,24 @@ class SK010CheckList extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
],
columns : [

34
src/components/CustomPages/SK/SK026ShowPrint.js
View File

@ -72,23 +72,23 @@ class SK026ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailMeasureContentBasics",
key: "Nav_DetailMeasureContentBasics",
render: (text, record) => {
return <label>{
record.Nav_DetailMeasureContentBasics && record.Nav_DetailMeasureContentBasics.map((item, i) => {
return item?.Nav_Law?.NAME + ' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailMeasureContentBasics",
// key: "Nav_DetailMeasureContentBasics",
// render: (text, record) => {
// return <label>{
// record.Nav_DetailMeasureContentBasics && record.Nav_DetailMeasureContentBasics.map((item, i) => {
// return item?.Nav_Law?.NAME + ' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',

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

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

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

@ -185,7 +185,7 @@ class SK039ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM + item2?.MEASURES_NAME}</tr>
})
}
</td>

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

@ -185,7 +185,7 @@ class SK041ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM +item2?.MEASURES_NAME}</tr>
})
}
</td>

4
src/config.js
View File

@ -44,7 +44,7 @@ const config = {
picServerHost: 'http://124.117.209.78:5199',
dataVUrl: "http://124.117.209.78:3167/home",
version: version,
guideSeverHost: "http://www.xmmhe.com/apk/",
guideSeverHost: "http://www.xmmhe.com/jyapk/",
guideH5Host: "http://www.xmmhe.com:5100/",
h5Web: "http://www.xmmhe.com:9201/",
},
@ -60,7 +60,7 @@ const config = {
picServerHost: 'http://121.41.2.71:5199',
dataVUrl: "http://121.41.2.71:3167/home",
version: version,
guideSeverHost: "http://121.41.2.71/apk/",
guideSeverHost: "http://121.41.2.71/jyapk/",
guideH5Host: "http://121.41.2.71:5100/",
h5Web: "http://121.41.2.71:9201/",
},

27
src/files/edit/SK004.js
View File

@ -539,19 +539,19 @@ export default {
{
let temp3={
ID: guid(),
DEPARTMENT_TYPE:3,
DEPARTMENT_TYPE:5,
}
let temp={
ID: guid(),
DEPARTMENT_TYPE:0,
DEPARTMENT_TYPE:10,
}
let temp1={
ID: guid(),
DEPARTMENT_TYPE:1,
DEPARTMENT_TYPE:15,
}
let temp2={
ID: guid(),
DEPARTMENT_TYPE:2,
DEPARTMENT_TYPE:20,
}
departs.push(temp3);
departs.push(temp);
@ -562,15 +562,15 @@ export default {
{
let temp={
ID: guid(),
DEPARTMENT_TYPE:0,
DEPARTMENT_TYPE:10,
}
let temp1={
ID: guid(),
DEPARTMENT_TYPE:1,
DEPARTMENT_TYPE:15,
}
let temp2={
ID: guid(),
DEPARTMENT_TYPE:2,
DEPARTMENT_TYPE:20,
}
departs.push(temp);
departs.push(temp1);
@ -580,11 +580,11 @@ export default {
{
let temp1={
ID: guid(),
DEPARTMENT_TYPE:1,
DEPARTMENT_TYPE:15,
}
let temp2={
ID: guid(),
DEPARTMENT_TYPE:2,
DEPARTMENT_TYPE:20,
}
departs.push(temp1);
departs.push(temp2);
@ -593,12 +593,12 @@ export default {
{
let temp={
ID: guid(),
DEPARTMENT_TYPE:2,
DEPARTMENT_TYPE:20,
}
departs.push(temp);
}
}
stateData.Nav_Departs = departs
// stateData.Nav_Departs = departs
if(login.tempAddData.Nav_Details)
{
let details=[]
@ -658,6 +658,11 @@ export default {
if(stateData)
{
let temps=[]
if(!stateData.PRODUCTION_UNIT_ID)
{
message.error("请先选择生产单元！");
return;
}
if(!stateData.Nav_Departs)
{
message.error("请先填写管控层级！");

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

@ -75,19 +75,33 @@ export default {
ID:guid(),
MineType: item.MineType,
AREA_ID: item.AREA_ID,
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
TYPE_ID: item.TYPE_ID,
RISK_NAME_ID: item.RISK_NAME_ID,
RISK_NAME: item.RISK_NAME,
RISK_DESCRIPTION: item.RISK_DESCRIPTION,
MEASURE: item.MEASURE,
MEASURE: item.MINE_NAME,
EMERGENCY: item.EMERGENCY,
Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type,
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)
{
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
{
@ -96,15 +110,15 @@ export default {
});
if(temps && temps.length>0)
{
let tempOlds=[]
temps.map(t=>{
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);
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;
close();

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

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