diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue index 8b63478..8b882bd 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue @@ -19,30 +19,26 @@ - - - 隐患来源:隐患快报 - {{ '隐患描述:' + (item.HIDDENDESCR ? (item.HIDDENDESCR.length > 15 ? item.HIDDENDESCR.substr(0, 15) + '...' : item.HIDDENDESCR) : '暂无') }} - - - 隐患级别: + + + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 {{item.HIDDENLEVELNAME}} {{item.HIDDENLEVELNAME}} 未确认 已确认 - + + 安全环保检查 + 风险排查清单检查 + 隐患排查清单检查 隐患来源:隐患快报 隐患来源:隐患排查 隐患来源:隐患排查 - 隐患来源:安全环保检查 - 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - - - 整改时间: {{item.RECTIFICATIONTIME}} + {{item.RECTIFICATIONTIME}} @@ -189,7 +185,11 @@ }, //跳转事件 gotRectify(e) { - if (e.HIDDEN_RISKSTANDARD === '1') { + if (e.SOURCE === '4' || e.SOURCE === '5') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail?id='+e.HIDDEN_ID, + }); + } else if (e.HIDDEN_RISKSTANDARD === '1') { uni.navigateTo({ url: '/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail?id='+e.HIDDEN_ID, }); diff --git a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue index d7c7c96..934993a 100644 --- a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue +++ b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue @@ -19,36 +19,26 @@ - + - - 隐患描述: - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - - + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} - + + 安全环保检查 + 风险排查清单检查 + 隐患排查清单检查 隐患来源:隐患快报 隐患来源:隐患排查 隐患来源:隐患排查 - 隐患来源:安全环保检查 - 隐患来源:安全环保检查 - - - 隐患级别: - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - 未确认 - 已确认 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} + {{item.RECTIFICATIONTIME}} - - 整改时间: {{item.RECTIFICATIONTIME}} - @@ -199,7 +189,11 @@ }, //跳转事件 gotRectify(e) { - if (e.HIDDEN_RISKSTANDARD === '1') { + if (e.SOURCE === '4' || e.SOURCE === '5') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail?id='+e.HIDDEN_ID, + }); + } else if (e.HIDDEN_RISKSTANDARD === '1') { uni.navigateTo({ url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail?id='+e.HIDDEN_ID, }); diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue index ce6d743..78cc362 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue @@ -21,26 +21,27 @@ - - {{ '隐患描述:' + (item.HIDDENDESCR ? (item.HIDDENDESCR.length > 15 ? item.HIDDENDESCR.substr(0, 15) + '...' : item.HIDDENDESCR) : '暂无') }} - + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + 未确认 + 已确认 + - - 隐患级别: - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - - + + 安全环保检查 + 风险排查清单检查 + 隐患排查清单检查 隐患来源:隐患快报 隐患来源:隐患排查 隐患来源:隐患排查 - 隐患来源:安全环保检查 - 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - + @@ -198,7 +199,11 @@ icon:'none' }); }else{ - if (e.HIDDEN_RISKSTANDARD === '1') { + if (e.SOURCE === '4' || e.SOURCE === '5') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail?id='+e.HIDDEN_ID, + }); + } else if (e.HIDDEN_RISKSTANDARD === '1') { uni.navigateTo({ url: '/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail?id='+e.HIDDEN_ID, }); diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue index f0579e4..40a3a41 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue @@ -18,27 +18,26 @@ - + - - 隐患描述: - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} 暂无 + + + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + 未确认 + 已确认 - - 隐患级别: - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - 未确认 - 已确认 - - 隐患来源:隐患快报 + 安全环保检查 + 风险排查清单检查 + 隐患排查清单检查 + 隐患来源:隐患快报 隐患来源:隐患排查 隐患来源:隐患排查 - 隐患来源:安全环保检查 - 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} @@ -194,7 +193,11 @@ }, //跳转事件 gotRectify(e) { - if (e.HIDDEN_RISKSTANDARD === '1') { + if (e.SOURCE === '4' || e.SOURCE === '5') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail?id='+e.HIDDEN_ID, + }); + } else if (e.HIDDEN_RISKSTANDARD === '1') { uni.navigateTo({ url: '/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail?id='+e.HIDDEN_ID, }); diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue index eb68052..644be4d 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue @@ -44,8 +44,8 @@ 隐患级别 - 一般隐患 - 重大隐患 + 风险排查隐患 + 隐患排查隐患 隐患级别 @@ -110,31 +110,24 @@ - - - - 隐患描述: - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - - - 隐患级别: - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - + + + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} - + + 安全环保检查 + 风险排查清单检查 + 隐患排查清单检查 隐患来源:隐患快报 隐患来源:隐患排查 隐患来源:隐患排查 - 隐患来源:安全环保检查 - 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - - - 整改时间:{{item.RECTIFICATIONTIME}} + {{item.RECTIFICATIONTIME}} @@ -372,7 +365,11 @@ }, //跳转事件 gotRectify(e) { - if (e.HIDDEN_RISKSTANDARD === '1') { + if (e.SOURCE === '4' || e.SOURCE === '5') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail?id='+e.HIDDEN_ID, + }); + } else if (e.HIDDEN_RISKSTANDARD === '1') { uni.navigateTo({ url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail?id='+e.HIDDEN_ID, });