From d9a6cb9519c2a5b1b4a8ee022b5d30aaa2c61981 Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 5 Jul 2024 14:35:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 + pages/apply/subPages/HM/2riskRecordEdit.vue | 6 +- pages/apply/subPages/HM/2riskRecordShow.vue | 4 +- pages/apply/subPages/HM/3hazardTaskEdit.vue | 544 ++++++++++++++++++++ pages/apply/subPages/HM/6evaluateEdit.vue | 15 +- pages/index/index2.nvue | 3 + services/apply/HMServices/HMServices.js | 2 +- 7 files changed, 568 insertions(+), 13 deletions(-) create mode 100644 pages/apply/subPages/HM/3hazardTaskEdit.vue diff --git a/pages.json b/pages.json index 97531f9..2f71466 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..99caede --- /dev/null +++ b/pages/apply/subPages/HM/3hazardTaskEdit.vue @@ -0,0 +1,544 @@ + + + + + \ 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); } From 60d2e16900a068161e8fb4ea1301821c4c1c9cb8 Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 5 Jul 2024 16:34:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=E5=8D=B1=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/HM/3hazardTaskEdit.vue | 70 +++++++++------------ 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/pages/apply/subPages/HM/3hazardTaskEdit.vue b/pages/apply/subPages/HM/3hazardTaskEdit.vue index 99caede..5fd9ad4 100644 --- a/pages/apply/subPages/HM/3hazardTaskEdit.vue +++ b/pages/apply/subPages/HM/3hazardTaskEdit.vue @@ -66,7 +66,7 @@ + @click="handleQuerySelect({ formIndex: 'Nav_Identifyings', isMultiple: true, dataIndex: index})"> 0) { + if (this.model.Nav_Areas.length > 0) { extendRule(json, 'TASK_ID', 1, this.model.ID); extendInclude(json, 'Nav_Area'); getRequest(json, "/HM/HazardTaskArea/Entities").then(res => { @@ -397,6 +393,7 @@ this.qsCom = { show: true, name: opt.NAME, + dataIndex:opt.dataIndex, formIndex: opt.formIndex, isMultiple: opt.isMultiple, lists: column @@ -423,13 +420,23 @@ extendGroupRule(tempGroup, 'NAME', 9, value) extendFilterGroup(json, tempGroup); } - let result = [] - extendRule(json, 'TASK_ID', 1, this.model.ID); - extendInclude(json, 'Nav_Identifying'); - const raw = await getRequest(json, "/HM/HazardTaskIdentifying/Entities").then(res => { - this.curTotal = res.TotalCount - return res - }) + let result = []; + var raw = []; + if (this.model.Nav_Identifyings.length > 0) { + extendRule(json, 'TASK_ID', 1, this.model.ID); + extendInclude(json, 'Nav_Identifying'); + raw = await getRequest(json, "/HM/HazardTaskIdentifying/Entities").then(res => { + this.curTotal = res.TotalCount + return res + }) + }else{ + extendRule(json, 'RISK_TYPE', 1, 2); + raw = await getIdentifying(json).then(res => { + this.curTotal = res.TotalCount + return res + }) + } + result = raw.map(item => { return { ...item, @@ -437,26 +444,23 @@ IDENTIFYING_ID: item?.Nav_Identifying.ID } }) - console.log(result) return result }, onSelectedQS(val) { - console.log(val) - const { - formIndex, - } = this.qsCom - this.model.Nav_Detail.Nav_Identifyings = []; + const { formIndex, dataIndex } = this.qsCom + var detailId=this.model.Nav_Detail[dataIndex].ID; + this.model.Nav_Detail[dataIndex].Nav_Identifyings = []; val.forEach(item => { let obj = { - IDENTIFYING_ID: item.ID, + IDENTIFYING_ID: item.IDENTIFYING_ID, Nav_Identifying: { NAME: item.NAME }, ID: guid(), - TASK_ID: this.model.ID, + TASK_DETAIL_ID: detailId, ORG_ID: this.ORG_ID, } - this.model.Nav_Detail.Nav_Identifyings.push(obj); + this.model.Nav_Detail[dataIndex].Nav_Identifyings.push(obj); }) this.qsCom.show = false }, @@ -477,29 +481,15 @@ if (this.model.NOTE_AKER_ID == "") { this.model.NOTE_AKER_ID = uni.getStorageSync('appInfo').User.ID; } - this.model.Nav_Areas.forEach(item => { - item.IS_DELETED = true; - }); - var uniqueAreas = new Set(); - this.model.Nav_Detail.filter(t => t.IS_DELETED == false).forEach(function(obj) { - uniqueAreas.add(obj.AREA_ID); - }); - let uniqueAreasArray = Array.from(uniqueAreas); - uniqueAreasArray.forEach(item => { - let obj = { - AREA_ID: item, - TASK_ID: this.model.ID, - ORG_ID: this.ORG_ID, - } - this.model.Nav_Areas.push(obj) - }) - this.model.Nav_LiableUser = null; this.model.Nav_Detail.forEach(item => { item.Nav_User = null; item.Nav_Area = null; item.Nav_Users.forEach(item2 => { item2.Nav_User = null; }); + item.Nav_Identifyings.forEach(item2 => { + item2.Nav_Identifying = null; + }); }); this.model.Nav_Files.forEach(item => { if (item.TASK_ID == undefined) {