diff --git a/src/components/CustomPages/SK/SK002CheckList.js b/src/components/CustomPages/SK/SK002CheckList.js index bca0d19..f77d4a6 100644 --- a/src/components/CustomPages/SK/SK002CheckList.js +++ b/src/components/CustomPages/SK/SK002CheckList.js @@ -76,7 +76,27 @@ 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{departTypeLists} + } + else + { return + } } }, ], @@ -221,7 +241,7 @@ class SK002CheckList extends React.Component {

基础库



- +

-
+


{this.state.dataList? - - { - return - } - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, + // { + // title: "检查依据", + // dataIndex: "Nav_DetailBasics", + // key: "Nav_DetailBasics", + // render: (text, record) => + // { + // return + // } + // }, + // { + // title: "判定标准", + // dataIndex: "CHECK_STANDARD", + // key: "CHECK_STANDARD", + // }, { title: '操作', dataIndex: '', diff --git a/src/components/CustomPages/SK/SK002ShowSummary.js b/src/components/CustomPages/SK/SK002ShowSummary.js index b881a41..3e31f20 100644 --- a/src/components/CustomPages/SK/SK002ShowSummary.js +++ b/src/components/CustomPages/SK/SK002ShowSummary.js @@ -94,8 +94,8 @@ class SK002ShowSummary extends React.Component { - - + {/* + */} @@ -157,12 +157,12 @@ class SK002ShowSummary extends React.Component { - + */} diff --git a/src/components/CustomPages/SK/SK004CheckList.js b/src/components/CustomPages/SK/SK004CheckList.js index 32ffc09..34de582 100644 --- a/src/components/CustomPages/SK/SK004CheckList.js +++ b/src/components/CustomPages/SK/SK004CheckList.js @@ -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 - } - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, + // { + // title: "检查依据", + // dataIndex: "Nav_DetailBasics", + // key: "Nav_DetailBasics", + // render: (text, record) => + // { + // return + // } + // }, + // { + // title: "判定标准", + // dataIndex: "CHECK_STANDARD", + // key: "CHECK_STANDARD", + // }, ], columns : [ diff --git a/src/components/CustomPages/SK/SK004CheckListNew.js b/src/components/CustomPages/SK/SK004CheckListNew.js index b76bc34..c39e906 100644 --- a/src/components/CustomPages/SK/SK004CheckListNew.js +++ b/src/components/CustomPages/SK/SK004CheckListNew.js @@ -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", + // }, ], diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js index d8f26bc..ebd0b87 100644 --- a/src/components/CustomPages/SK/SK004ShowPrint.js +++ b/src/components/CustomPages/SK/SK004ShowPrint.js @@ -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 - } - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, + // { + // title: "检查依据", + // dataIndex: "Nav_DetailBasics", + // key: "Nav_DetailBasics", + // render: (text, record) => + // { + // return + // } + // }, + // { + // title: "判定标准", + // dataIndex: "CHECK_STANDARD", + // key: "CHECK_STANDARD", + // }, { title: '操作', dataIndex: '', diff --git a/src/components/CustomPages/SK/SK010CheckList.js b/src/components/CustomPages/SK/SK010CheckList.js index 0813268..6e181a8 100644 --- a/src/components/CustomPages/SK/SK010CheckList.js +++ b/src/components/CustomPages/SK/SK010CheckList.js @@ -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 - } - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, + // { + // title: "检查依据", + // dataIndex: "Nav_DetailBasics", + // key: "Nav_DetailBasics", + // render: (text, record) => + // { + // return + // } + // }, + // { + // title: "判定标准", + // dataIndex: "CHECK_STANDARD", + // key: "CHECK_STANDARD", + // }, ], columns : [ diff --git a/src/components/CustomPages/SK/SK026ShowPrint.js b/src/components/CustomPages/SK/SK026ShowPrint.js index bf256d5..97497e5 100644 --- a/src/components/CustomPages/SK/SK026ShowPrint.js +++ b/src/components/CustomPages/SK/SK026ShowPrint.js @@ -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 - } - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, + // { + // title: "检查依据", + // dataIndex: "Nav_DetailMeasureContentBasics", + // key: "Nav_DetailMeasureContentBasics", + // render: (text, record) => { + // return + // } + // }, + // { + // title: "判定标准", + // dataIndex: "CHECK_STANDARD", + // key: "CHECK_STANDARD", + // }, { title: '操作', diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index 012d016..8082092 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -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 { }
管控层级 管控措施 检查内容检查依据判定标准检查依据判定标准隐患描述 隐患等级 整改措施 { item.CHECKCONTENTS} + {/* {item.CHECKBASICS } { item.CHECKSTANDARDS } - { item.HIDDENSCRIPTION }
- - - - + + + + - - - - + + + + { data?.Nav_Details && data.Nav_Details?.map((item, i) => { @@ -185,7 +185,7 @@ class SK033ShowPrint extends React.Component {
{ - data.STATUS === 30 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null + data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null }
:null diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js index 3c0131b..a495048 100644 --- a/src/components/CustomPages/SK/SK039ShowPrint.js +++ b/src/components/CustomPages/SK/SK039ShowPrint.js @@ -185,7 +185,7 @@ class SK039ShowPrint extends React.Component { { //item.MEASURE item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => { - return {item2?.MEASURES_NAME} + return {item2?.NUM + item2?.MEASURES_NAME} }) } diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js index 9ded215..b1d4eb8 100644 --- a/src/components/CustomPages/SK/SK041ShowPrint.js +++ b/src/components/CustomPages/SK/SK041ShowPrint.js @@ -185,7 +185,7 @@ class SK041ShowPrint extends React.Component { { //item.MEASURE item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => { - return {item2?.MEASURES_NAME} + return {item2?.NUM +item2?.MEASURES_NAME} }) } diff --git a/src/config.js b/src/config.js index 50aa154..b872d15 100644 --- a/src/config.js +++ b/src/config.js @@ -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/", }, diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js index f4fcd58..82a2870 100644 --- a/src/files/edit/SK004.js +++ b/src/files/edit/SK004.js @@ -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("请先填写管控层级!"); diff --git a/src/files/edit/SK033.js b/src/files/edit/SK033.js index a334f6d..7b7f2a3 100644 --- a/src/files/edit/SK033.js +++ b/src/files/edit/SK033.js @@ -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) { - 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) - { - message.error('导入内容已存在,请核对'); - return; - } - }) - stateData.Nav_Details = temps; + let tempOlds=[] + temps.map(t=>{ + 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) + { + tempOlds.push(t) + } + }) + stateData.Nav_Details = tempOlds; } login.tempDatas =null; close(); diff --git a/src/files/list/SK066.js b/src/files/list/SK066.js index 02845c3..63126a8 100644 --- a/src/files/list/SK066.js +++ b/src/files/list/SK066.js @@ -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); });
序号生产单元辨识区域风险名称序号生产单元辨识区域风险名称 风险描述风险类别管控措施应急处置状态风险类别管控措施应急处置状态