diff --git a/pages.json b/pages.json index 8b753b5..2772c63 100644 --- a/pages.json +++ b/pages.json @@ -83,6 +83,14 @@ "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail", "style": {} }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail", + "style": {} + }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail", + "style": {} + }, { "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue", "style": {} @@ -91,6 +99,14 @@ "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail", "style": {} }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail", + "style": {} + }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail", + "style": {} + }, { "path": "pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record", "style": {} @@ -139,6 +155,14 @@ "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail", "style": {} }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail", + "style": {} + }, + { + "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail", + "style": {} + }, { "path": "pages/application/hidden-danger-management/hidden-danger-unqualified/hidden-danger-unqualified", "style": {} diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue new file mode 100644 index 0000000..ec9143a --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue @@ -0,0 +1,774 @@ + + + + + diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue new file mode 100644 index 0000000..03c936f --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue @@ -0,0 +1,776 @@ + + + + + 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 92ba530..4863b84 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 @@ -18,17 +18,19 @@ - + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} 暂无 {{item.HIDDENLEVELNAME}} {{item.HIDDENLEVELNAME}} - - 来源:隐患快报 - 来源:隐患排查 - 来源:隐患排查 + + 风险排查清单检查 + 隐患排查清单检查 + 来源:隐患快报 + 来源:清单排查 + 来源:清单排查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} @@ -108,8 +110,8 @@ }); let DISPOSESTATE = 3; uni.request({ - url: basePath + '/app/hidden/list', - method: 'POST', + url: basePath + '/app/hidden/listRiskStandard', // /app/hidden/list', + method: 'POST', dataType: 'json', header:{ 'Content-type':'application/x-www-form-urlencoded' @@ -179,9 +181,15 @@ }, //跳转事件 gotRectify(e) { - uni.navigateTo({ - url: '/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail?id='+e, - }); + 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, + }); + } else if (e.HIDDEN_RISKSTANDARD === '2') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail?id='+e.HIDDEN_ID, + }); + } }, //跳转事件 gotReview(e) { diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue new file mode 100644 index 0000000..3fa9d6d --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue @@ -0,0 +1,1343 @@ + + + + + diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue new file mode 100644 index 0000000..a762ccb --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue @@ -0,0 +1,1346 @@ + + + + + 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 b9ce848..cb94d53 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 @@ -31,10 +31,12 @@ 已确认 - - 来源:隐患快报 - 来源:隐患排查 - 来源:隐患排查 + + 风险排查清单检查 + 隐患排查清单检查 + 来源:隐患快报 + 来源:清单排查 + 来源:清单排查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} @@ -116,7 +118,7 @@ }); let DISPOSESTATE = 2; uni.request({ - url: basePath + '/app/hidden/list', + url: basePath + '/app/hidden/listRiskStandard', // /app/hidden/list method: 'POST', dataType: 'json', header:{ @@ -195,9 +197,15 @@ icon:'none' }); }else{ - uni.navigateTo({ - url: '/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail?id='+e.HIDDEN_ID, - }); + 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, + }); + } else if (e.HIDDEN_RISKSTANDARD === '2') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail?id='+e.HIDDEN_ID, + }); + } } diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue new file mode 100644 index 0000000..9871c5d --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue @@ -0,0 +1,565 @@ + + + + + diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue new file mode 100644 index 0000000..96b269c --- /dev/null +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue @@ -0,0 +1,567 @@ + + + + + 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 d4a0f96..aedf5cd 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,7 +18,7 @@ - + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} @@ -31,12 +31,13 @@ 已确认 - - - 来源:隐患快报 - 来源:隐患排查 - 来源:隐患排查 - + + 风险排查清单检查 + 隐患排查清单检查 + 来源:隐患快报 + 来源:清单排查 + 来源:清单排查 + 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} {{item.RECTIFICATIONTIME}} @@ -118,7 +119,7 @@ }); let DISPOSESTATE = 2; uni.request({ - url: basePath + '/app/hidden/list', + url: basePath + '/app/hidden/listRiskStandard', // /app/hidden/list method: 'POST', dataType: 'json', header:{ @@ -191,9 +192,15 @@ }, //跳转事件 gotRectify(e) { - uni.navigateTo({ - url: '/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail?id='+e, - }); + 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, + }); + } else if (e.HIDDEN_RISKSTANDARD === '2') { + uni.navigateTo({ + url: '/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail?id='+e.HIDDEN_ID, + }); + } }, //跳转事件 gotReview(e) { diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue index 3d8d819..67faa4f 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue @@ -18,45 +18,44 @@ - 检查类别 - {{pd.RISK_UNIT}} + {{pd.CHECK_CATEGORY_NAME}} - 辨识部位 + 检查项目 - {{pd.IDENTIFICATION}} + {{pd.CHECK_ITEM_NAME}} + + + 检查内容 + + + {{pd.CHECK_CONTENT}} + + - 存在风险 + 检查标准 - {{pd.RISK_DESCR}} + {{pd.CHECK_STANDARD}} - + - 风险分级 + 参考依据 - {{pd.LEVEL}} - - - - - 检查内容 - - - {{pd.CHECK_CONTENT}} + {{pd.REFERENCE_BASIS}}