From 4da9d3c1b5e594a00b7825a3b627491b8043dd89 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: Wed, 10 Jul 2024 10:31:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 64 ++++++++++------ pages/my/subPages/userInfo1.vue | 6 +- yarn.lock | 126 ++++++++++++++++---------------- 3 files changed, 108 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b79507..6a46035 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,9 +74,15 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "peer": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -92,14 +98,28 @@ "peer": true }, "node_modules/postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "peer": true, "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -115,9 +135,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "peer": true, "engines": { "node": ">=0.10.0" @@ -192,9 +212,9 @@ } }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "peer": true }, "picocolors": { @@ -204,14 +224,14 @@ "peer": true }, "postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "peer": true, "requires": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" } }, "source-map": { @@ -221,9 +241,9 @@ "peer": true }, "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "peer": true }, "vue": { diff --git a/pages/my/subPages/userInfo1.vue b/pages/my/subPages/userInfo1.vue index a75dae0..5bbc3ab 100644 --- a/pages/my/subPages/userInfo1.vue +++ b/pages/my/subPages/userInfo1.vue @@ -21,12 +21,12 @@ inputAlign="left"> --> {{userInfo.ID_CARD}} - + {{userInfo.DepartmentName}} - + {{userInfo.PostName}} diff --git a/yarn.lock b/yarn.lock index 624e4ad..98cd4e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,86 +3,86 @@ "@babel/parser@^7.18.4": - "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==" - "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz" - "version" "7.22.7" + version "7.22.7" + resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz" + integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q== "@vue/compiler-sfc@2.7.14": - "integrity" "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==" - "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz" - "version" "2.7.14" + version "2.7.14" + resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz" + integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA== dependencies: "@babel/parser" "^7.18.4" - "postcss" "^8.4.14" - "source-map" "^0.6.1" + postcss "^8.4.14" + source-map "^0.6.1" -"charenc@0.0.2": - "integrity" "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" - "resolved" "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz" - "version" "0.0.2" +charenc@0.0.2: + version "0.0.2" + resolved "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz" + integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== -"crypt@0.0.2": - "integrity" "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==" - "resolved" "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz" - "version" "0.0.2" +crypt@0.0.2: + version "0.0.2" + resolved "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz" + integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== -"csstype@^3.1.0": - "integrity" "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" - "resolved" "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz" - "version" "3.1.2" +csstype@^3.1.0: + version "3.1.2" + resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== -"is-buffer@~1.1.6": - "integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - "resolved" "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz" - "version" "1.1.6" +is-buffer@~1.1.6: + version "1.1.6" + resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -"md5@^2.3.0": - "integrity" "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==" - "resolved" "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz" - "version" "2.3.0" +md5@^2.3.0: + version "2.3.0" + resolved "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz" + integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== dependencies: - "charenc" "0.0.2" - "crypt" "0.0.2" - "is-buffer" "~1.1.6" + charenc "0.0.2" + crypt "0.0.2" + is-buffer "~1.1.6" -"nanoid@^3.3.6": - "integrity" "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" - "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz" - "version" "3.3.6" +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -"picocolors@^1.0.0": - "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" - "resolved" "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz" - "version" "1.0.0" +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -"postcss@^8.4.14": - "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==" - "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz" - "version" "8.4.27" +postcss@^8.4.14: + version "8.4.38" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== dependencies: - "nanoid" "^3.3.6" - "picocolors" "^1.0.0" - "source-map-js" "^1.0.2" + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" -"source-map-js@^1.0.2": - "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" - "resolved" "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz" - "version" "1.0.2" +source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== -"source-map@^0.6.1": - "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz" - "version" "0.6.1" +source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -"vue@^2.0.0": - "integrity" "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==" - "resolved" "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz" - "version" "2.7.14" +vue@^2.0.0: + version "2.7.14" + resolved "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz" + integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ== dependencies: "@vue/compiler-sfc" "2.7.14" - "csstype" "^3.1.0" + csstype "^3.1.0" -"vuex@3": - "integrity" "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==" - "resolved" "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz" - "version" "3.6.2" +vuex@3: + version "3.6.2" + resolved "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz" + integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== From ff99693d36ad1ecd1f20f9f81b85387b6673f698 Mon Sep 17 00:00:00 2001 From: wjn Date: Thu, 11 Jul 2024 17:10:11 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/HM/2riskRecordEdit.vue | 4 +- pages/apply/subPages/HM/6evaluateEdit.vue | 107 +++++++++++--------- 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/pages/apply/subPages/HM/2riskRecordEdit.vue b/pages/apply/subPages/HM/2riskRecordEdit.vue index b5ebbf5..7410913 100644 --- a/pages/apply/subPages/HM/2riskRecordEdit.vue +++ b/pages/apply/subPages/HM/2riskRecordEdit.vue @@ -465,9 +465,9 @@ i].Nav_Identifying.NAME; } } - let strPosts = '' if (res.Nav_Details && res.Nav_Details.length > 0) { for (let i = 0; i < res.Nav_Details.length; i++) { + let strPosts = '' for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordWorkduty.length; j++) { strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Details[i] .Nav_EvaluateRiskRecordWorkduty[ @@ -476,9 +476,9 @@ this.model.Nav_Details[i].Posts = strPosts; } } - let strEqus = '' if (res.Nav_Details && res.Nav_Details.length > 0) { for (let i = 0; i < res.Nav_Details.length; i++) { + let strEqus = '' for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordEquipment.length; j++) { strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Details[i] .Nav_EvaluateRiskRecordEquipment[ diff --git a/pages/apply/subPages/HM/6evaluateEdit.vue b/pages/apply/subPages/HM/6evaluateEdit.vue index 9e9337b..88a0c18 100644 --- a/pages/apply/subPages/HM/6evaluateEdit.vue +++ b/pages/apply/subPages/HM/6evaluateEdit.vue @@ -99,10 +99,10 @@ disabled disabledColor="#fff"> + @click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})"> - @@ -112,11 +112,11 @@ + @click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})"> - @@ -125,10 +125,10 @@ + @click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})"> - @@ -138,10 +138,10 @@ + @click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})"> - @@ -151,10 +151,10 @@ + @click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})"> - @@ -211,8 +211,8 @@ inputAlign="right" disabled disabledColor="#fff"> - + + @click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})"> - @@ -263,25 +263,25 @@ - + + @click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})"> - - + + @click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})"> - @@ -289,12 +289,12 @@ - + + @click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})"> - @@ -302,12 +302,12 @@ - + + @click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})"> - @@ -396,6 +396,7 @@ show: false, lists: [], formIndex: undefined, + itemIndex: undefined, isMultiple: false, defaultChecked: [] }, @@ -430,6 +431,7 @@ this.qsCom = { show: true, formIndex: opt.formIndex, + itemIndex: opt.itemIndex, isMultiple: opt.isMultiple, lists: column } @@ -497,9 +499,11 @@ onSelectedQS(val) { const { formIndex, + itemIndex, } = this.qsCom + console.log(itemIndex) if (formIndex == "Individual") { - this.model.Nav_EvaluateRiskIndividualMeasures = []; + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures = []; val.forEach(item => { let obj = { INDIVIDUAL_MEASURES_ID: item.ID, @@ -509,11 +513,12 @@ ID: guid(), EVALUATION_RESULT_RISK_ID: this.model.ID, ORG_ID: this.ORG_ID, + IS_DELETED: false, } - this.model.Nav_EvaluateRiskIndividualMeasures.push(obj); + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures.push(obj); }) } else if (formIndex == "Engineering") { - this.model.Nav_EvaluateRiskEngineeringMeasures = []; + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEngineeringMeasures = []; val.forEach(item => { let obj = { ENGINEERING_MEASURES_ID: item.ID, @@ -523,11 +528,12 @@ ID: guid(), EVALUATION_RESULT_RISK_ID: this.model.ID, ORG_ID: this.ORG_ID, + IS_DELETED: false, } - this.model.Nav_EvaluateRiskEngineeringMeasures.push(obj); + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEngineeringMeasures.push(obj); }) } else if (formIndex == "Management") { - this.model.Nav_EvaluateRiskManagementMeasures = []; + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskManagementMeasures = []; val.forEach(item => { let obj = { MANAGEMENT_MEASURES_ID: item.ID, @@ -537,11 +543,12 @@ ID: guid(), EVALUATION_RESULT_RISK_ID: this.model.ID, ORG_ID: this.ORG_ID, + IS_DELETED: false, } - this.model.Nav_EvaluateRiskManagementMeasures.push(obj); + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskManagementMeasures.push(obj); }) } else if (formIndex == "Education") { - this.model.Nav_EvaluateRiskEducationMeasures = []; + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEducationMeasures = []; val.forEach(item => { let obj = { EDUCATION_MEASURES_ID: item.ID, @@ -551,11 +558,12 @@ ID: guid(), EVALUATION_RESULT_RISK_ID: this.model.ID, ORG_ID: this.ORG_ID, + IS_DELETED: false, } - this.model.Nav_EvaluateRiskEducationMeasures.push(obj); + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEducationMeasures.push(obj); }) } else if (formIndex == "Emergency") { - this.model.Nav_EvaluateRiskEmergencyMeasures = []; + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEmergencyMeasures = []; val.forEach(item => { let obj = { EMERGENCY_MEASURES_ID: item.ID, @@ -565,8 +573,9 @@ ID: guid(), EVALUATION_RESULT_RISK_ID: this.model.ID, ORG_ID: this.ORG_ID, + IS_DELETED: false, } - this.model.Nav_EvaluateRiskEmergencyMeasures.push(obj); + this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEmergencyMeasures.push(obj); }) } this.qsCom.defaultChecked = []; @@ -597,9 +606,9 @@ this.AUDIT_OPINION = refusRes; }) } - let strPosts = '' if (res.Nav_Risks && res.Nav_Risks.length > 0) { for (let i = 0; i < res.Nav_Risks.length; i++) { + let strPosts = '' for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskWorkduty.length; j++) { strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Risks[i] .Nav_EvaluateRiskWorkduty[ @@ -618,9 +627,9 @@ this.model.Nav_Risks[i].Posts = strPosts; } } - let strEqus = '' if (res.Nav_Risks && res.Nav_Risks.length > 0) { for (let i = 0; i < res.Nav_Risks.length; i++) { + let strEqus = '' for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskEquipment.length; j++) { strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Risks[i] .Nav_EvaluateRiskEquipment[ @@ -670,15 +679,15 @@ this.model.ORG_ID = this.ORG_ID; } this.model.Nav_Files = null; - this.model.Nav_Risks.forEach(item => { - item.Nav_EvaluateRiskWorkduty = null; - item.Nav_EvaluateRiskEquipment = null; - item.Nav_EvaluateRiskIndividualMeasures = null; - item.Nav_EvaluateRiskEngineeringMeasures = null; - item.Nav_EvaluateRiskManagementMeasures = null; - item.Nav_EvaluateRiskEducationMeasures = null; - item.Nav_EvaluateRiskEmergencyMeasures = null; - }); + // this.model.Nav_Risks.forEach(item => { + // item.Nav_EvaluateRiskWorkduty = null; + // item.Nav_EvaluateRiskEquipment = null; + // item.Nav_EvaluateRiskIndividualMeasures = null; + // item.Nav_EvaluateRiskEngineeringMeasures = null; + // item.Nav_EvaluateRiskManagementMeasures = null; + // item.Nav_EvaluateRiskEducationMeasures = null; + // item.Nav_EvaluateRiskEmergencyMeasures = null; + // }); const ele = this.$refs //ele['wForm'].validate().then(res => { getRequest(this.model, "/HM/HMEvaluateResult/FullUpdate").then(res => { From fc2b26e15b1b32f21d84915fffdc09849720c366 Mon Sep 17 00:00:00 2001 From: wjn Date: Thu, 11 Jul 2024 17:19:56 +0800 Subject: [PATCH 3/7] 1 --- pages/apply/subPages/HM/6evaluateEdit.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/apply/subPages/HM/6evaluateEdit.vue b/pages/apply/subPages/HM/6evaluateEdit.vue index 88a0c18..d131555 100644 --- a/pages/apply/subPages/HM/6evaluateEdit.vue +++ b/pages/apply/subPages/HM/6evaluateEdit.vue @@ -501,7 +501,6 @@ formIndex, itemIndex, } = this.qsCom - console.log(itemIndex) if (formIndex == "Individual") { this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures = []; val.forEach(item => { From 216d95173c85a55c9b8ccf34f254858e56cfc011 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Fri, 12 Jul 2024 09:12:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BF=9E=E7=8C=9Bapp=20?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index2.nvue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/index/index2.nvue b/pages/index/index2.nvue index fb3934c..b1cea58 100644 --- a/pages/index/index2.nvue +++ b/pages/index/index2.nvue @@ -144,7 +144,7 @@ noticeTotal: 0, lists: [], banners: [ - '../../static/banner5.jpg', + // '../../static/banner5.jpg', '../../static/banner6.jpg', '../../static/banner7.png' ], From be03f9223c040ea27b8b69e70c35f2025fb7344e Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Fri, 12 Jul 2024 09:34:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=8D=A0=E6=AF=94=E6=8E=92=E5=BA=8F=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/performance/index1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/performance/index1.vue b/pages/performance/index1.vue index 10256bb..1013276 100644 --- a/pages/performance/index1.vue +++ b/pages/performance/index1.vue @@ -598,7 +598,8 @@ async getRiskLevel() { const orgId = uni.getStorageSync('orgId') let json = initFilter(orgId); - extendOrder(json, "CREATE_TIME", 0); + // extendOrder(json, "CREATE_TIME", 0); + extendOrder(json, "NUM", 0); // extendRule(json, "COLOR", 1, ); const res = await getRiskLevel(json) if (res.IsSuccessful) { From 5b668801a4c4677b0f9202ea91801b7d0baae930 Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 12 Jul 2024 15:10:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/HM/6evaluateEdit.vue | 60 +++++++++++++++++------ 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/pages/apply/subPages/HM/6evaluateEdit.vue b/pages/apply/subPages/HM/6evaluateEdit.vue index d131555..13a7137 100644 --- a/pages/apply/subPages/HM/6evaluateEdit.vue +++ b/pages/apply/subPages/HM/6evaluateEdit.vue @@ -510,7 +510,7 @@ NAME: item.NAME }, ID: guid(), - EVALUATION_RESULT_RISK_ID: this.model.ID, + EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID, ORG_ID: this.ORG_ID, IS_DELETED: false, } @@ -525,7 +525,7 @@ NAME: item.NAME }, ID: guid(), - EVALUATION_RESULT_RISK_ID: this.model.ID, + EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID, ORG_ID: this.ORG_ID, IS_DELETED: false, } @@ -540,7 +540,7 @@ NAME: item.NAME }, ID: guid(), - EVALUATION_RESULT_RISK_ID: this.model.ID, + EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID, ORG_ID: this.ORG_ID, IS_DELETED: false, } @@ -555,7 +555,7 @@ NAME: item.NAME }, ID: guid(), - EVALUATION_RESULT_RISK_ID: this.model.ID, + EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID, ORG_ID: this.ORG_ID, IS_DELETED: false, } @@ -570,7 +570,7 @@ NAME: item.NAME }, ID: guid(), - EVALUATION_RESULT_RISK_ID: this.model.ID, + EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID, ORG_ID: this.ORG_ID, IS_DELETED: false, } @@ -678,15 +678,47 @@ this.model.ORG_ID = this.ORG_ID; } this.model.Nav_Files = null; - // this.model.Nav_Risks.forEach(item => { - // item.Nav_EvaluateRiskWorkduty = null; - // item.Nav_EvaluateRiskEquipment = null; - // item.Nav_EvaluateRiskIndividualMeasures = null; - // item.Nav_EvaluateRiskEngineeringMeasures = null; - // item.Nav_EvaluateRiskManagementMeasures = null; - // item.Nav_EvaluateRiskEducationMeasures = null; - // item.Nav_EvaluateRiskEmergencyMeasures = null; - // }); + + this.model.Nav_Risks.forEach(item => { + item.Nav_EvaluateRiskWorkduty.forEach(item1 => { + item1.Nav_Post = null; + }); + item.Nav_EvaluateRiskEquipment.forEach(item1 => { + item1.Nav_Equipment = null; + }); + item.Nav_EvaluateRiskIndividualMeasures.forEach(item1 => { + item1.Nav_IndividualMeasures = null; + }); + item.Nav_EvaluateRiskEngineeringMeasures.forEach(item1 => { + item1.Nav_EngineeringMeasures = null; + }); + item.Nav_EvaluateRiskManagementMeasures.forEach(item1 => { + item1.Nav_ManagementMeasures = null; + }); + item.Nav_EvaluateRiskEducationMeasures.forEach(item1 => { + item1.Nav_EducationMeasures = null; + }); + item.Nav_EvaluateRiskEmergencyMeasures.forEach(item1 => { + item1.Nav_EmergencyMeasures = null; + }); + }); + this.model.Nav_Hazards.forEach(item => { + item.Nav_EvaluateHazardIndividualMeasures.forEach(item1 => { + item1.Nav_IndividualMeasures = null; + }); + item.Nav_EvaluateHazardEngineeringMeasures.forEach(item1 => { + item1.Nav_EngineeringMeasures = null; + }); + item.Nav_EvaluateHazardManagementMeasures.forEach(item1 => { + item1.Nav_ManagementMeasures = null; + }); + item.Nav_EvaluateHazardEducationMeasures.forEach(item1 => { + item1.Nav_EducationMeasures = null; + }); + item.Nav_EvaluateHazardEmergencyMeasures.forEach(item1 => { + item1.Nav_EmergencyMeasures = null; + }); + }); const ele = this.$refs //ele['wForm'].validate().then(res => { getRequest(this.model, "/HM/HMEvaluateResult/FullUpdate").then(res => { From fa84f07d244a20f7e45ad16d8885038085b5e008 Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 12 Jul 2024 17:25:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/HM/4riskShow.vue | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pages/apply/subPages/HM/4riskShow.vue b/pages/apply/subPages/HM/4riskShow.vue index 51b511f..1694c14 100644 --- a/pages/apply/subPages/HM/4riskShow.vue +++ b/pages/apply/subPages/HM/4riskShow.vue @@ -17,10 +17,10 @@ - +