From 5045425fdee718ff1fc4f978cff7249af7cb99a9 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Tue, 21 Oct 2025 09:22:58 +0800 Subject: [PATCH 1/4] 1 --- src/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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/", }, From a6623b642c426be5008eff1b0cb25c4f77ee5a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Tue, 21 Oct 2025 12:00:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SK/SK002CheckList.js | 26 +++++++++++++++--- src/files/edit/SK004.js | 27 +++++++++++-------- 2 files changed, 39 insertions(+), 14 deletions(-) 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? - Date: Wed, 22 Oct 2025 17:56:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SK/SK033ShowPrint.js | 20 +++++------ src/files/edit/SK033.js | 36 +++++++++++++------ src/files/list/SK066.js | 6 ++++ 3 files changed, 41 insertions(+), 21 deletions(-) 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 { }
- - - - + + + + - - - - + + + + { 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/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); }); From 6838f111ce5c70bc0f0e6c53db94a887c4619921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 23 Oct 2025 08:41:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=8B=BF=E6=8E=89?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BE=9D=E6=8D=AE=E5=92=8C=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SK/SK002ShowPrint.js | 36 +++++++++---------- .../CustomPages/SK/SK002ShowSummary.js | 8 ++--- .../CustomPages/SK/SK004CheckList.js | 36 +++++++++---------- .../CustomPages/SK/SK004CheckListNew.js | 20 +++++------ .../CustomPages/SK/SK004ShowPrint.js | 36 +++++++++---------- .../CustomPages/SK/SK010CheckList.js | 36 +++++++++---------- .../CustomPages/SK/SK026ShowPrint.js | 34 +++++++++--------- .../CustomPages/SK/SK039ShowPrint.js | 2 +- .../CustomPages/SK/SK041ShowPrint.js | 2 +- 9 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js index 7192f8c..e1e8092 100644 --- a/src/components/CustomPages/SK/SK002ShowPrint.js +++ b/src/components/CustomPages/SK/SK002ShowPrint.js @@ -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 - } - }, - { - 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/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} }) }
序号生产单元辨识区域风险名称序号生产单元辨识区域风险名称 风险描述风险类别管控措施应急处置状态风险类别管控措施应急处置状态
管控层级 管控措施 检查内容检查依据判定标准检查依据判定标准隐患描述 隐患等级 整改措施 { item.CHECKCONTENTS} + {/* {item.CHECKBASICS } { item.CHECKSTANDARDS } - { item.HIDDENSCRIPTION }