diff --git a/pages.json b/pages.json index 421f0a6..fd116cf 100644 --- a/pages.json +++ b/pages.json @@ -289,6 +289,13 @@ "onReachBottomDistance": 100 } }, + { + "path": "3hazardTaskEdit", + "style": { + "navigationBarTitleText": "职业危害辨识任务", + "onReachBottomDistance": 100 + } + }, { "path": "3hazardRecordShow", "style": { diff --git a/pages/apply/subPages/HM/2riskRecordEdit.vue b/pages/apply/subPages/HM/2riskRecordEdit.vue index 3d79515..b5ebbf5 100644 --- a/pages/apply/subPages/HM/2riskRecordEdit.vue +++ b/pages/apply/subPages/HM/2riskRecordEdit.vue @@ -87,7 +87,7 @@ - + - - + --> - + diff --git a/pages/apply/subPages/HM/3hazardTaskEdit.vue b/pages/apply/subPages/HM/3hazardTaskEdit.vue new file mode 100644 index 0000000..5fd9ad4 --- /dev/null +++ b/pages/apply/subPages/HM/3hazardTaskEdit.vue @@ -0,0 +1,534 @@ + + + + + \ No newline at end of file diff --git a/pages/apply/subPages/HM/6evaluateEdit.vue b/pages/apply/subPages/HM/6evaluateEdit.vue index 72dd38f..9e9337b 100644 --- a/pages/apply/subPages/HM/6evaluateEdit.vue +++ b/pages/apply/subPages/HM/6evaluateEdit.vue @@ -226,11 +226,11 @@ - + @@ -614,6 +614,7 @@ this.model.Nav_Risks[i].EVALUATE_SCORE = this.model.Nav_Risks[i].EVALUATE_SCORE == 0 ? "" : this.model.Nav_Risks[i].EVALUATE_SCORE; + this.caclScore(this.model.Nav_Risks[i]); this.model.Nav_Risks[i].Posts = strPosts; } } @@ -646,16 +647,16 @@ let score = item.EVALUATE_L * item.EVALUATE_E * item.EVALUATE_C; if (score > 320) { item.EVALUATE_LEVEL = "10"; - item.EVALUATE_LEVEL_SHOW = "一级"; + item.EVALUATE_LEVEL_SHOW = "重大风险"; } else if (160 < score && score <= 320) { item.EVALUATE_LEVEL = "20"; - item.EVALUATE_LEVEL_SHOW = "二级"; + item.EVALUATE_LEVEL_SHOW = "较大风险"; } else if (70 < score && score <= 160) { item.EVALUATE_LEVEL = "30"; - item.EVALUATE_LEVEL_SHOW = "三级"; + item.EVALUATE_LEVEL_SHOW = "一般风险"; } else if (score <= 70) { item.EVALUATE_LEVEL = "40"; - item.EVALUATE_LEVEL_SHOW = "四级"; + item.EVALUATE_LEVEL_SHOW = "低风险"; } item.EVALUATE_SCORE = score.toFixed(2); }, @@ -663,7 +664,7 @@ if (this.model.MODIFY_TYPE == 0) { this.model.MODIFY_TYPE = 1; } - //this.model.PUBLISH = "SaveAndNotify"; + this.model.PUBLISH = "SaveAndNotify"; this.model.TaskID = this.TaskID; if (this.model.ORG_ID == "") { this.model.ORG_ID = this.ORG_ID; diff --git a/pages/index/index2.nvue b/pages/index/index2.nvue index 1148acb..fb3934c 100644 --- a/pages/index/index2.nvue +++ b/pages/index/index2.nvue @@ -527,6 +527,9 @@ case 'HM063_SHOWPRINT': //危险辨识记录签到 linkToUrl = '../apply/subPages/HM/2riskRecordShow' break; + case 'HM102': //职业危害辨识记录 + linkToUrl = '../apply/subPages/HM/3hazardTaskEdit' + break; case 'HM101_SHOWPRINT': //职业危害辨识记录签到 linkToUrl = '../apply/subPages/HM/3hazardTaskShow' break; diff --git a/services/apply/HMServices/HMServices.js b/services/apply/HMServices/HMServices.js index 53b3e2c..491971d 100644 --- a/services/apply/HMServices/HMServices.js +++ b/services/apply/HMServices/HMServices.js @@ -33,7 +33,7 @@ export function getRiskRecordRefus(params) { //区域列表 export function getAreaLists(params) { return new Promise((resolve, reject) => { - request.post("/HM/HMRiskTask/OrderPagedArea", params).then((result) => { + request.post("/HM/HMRiskArea/OrderPagedArea", params).then((result) => { if (result.IsSuccessful) { resolve(result); }