ykx/lm-safe-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.122.43.22:3000/ykx/lm-safe-app

Browse Source
This commit is contained in:
wyw 2024-07-17 11:40:27 +08:00
commit 2e41387812
8 changed files with 211 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
package-lock.json generated
View File

@ -74,9 +74,15 @@
} }
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.3.6", "version": "3.3.7",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
],
"peer": true, "peer": true,
"bin": { "bin": {
"nanoid": "bin/nanoid.cjs" "nanoid": "bin/nanoid.cjs"
@ -92,14 +98,28 @@
"peer": true "peer": true
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.27", "version": "8.4.38",
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
"integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", "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, "peer": true,
"dependencies": { "dependencies": {
"nanoid": "^3.3.6", "nanoid": "^3.3.7",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.2" "source-map-js": "^1.2.0"
}, },
"engines": { "engines": {
"node": "^10 || ^12 || >=14" "node": "^10 || ^12 || >=14"
@ -115,9 +135,9 @@
} }
}, },
"node_modules/source-map-js": { "node_modules/source-map-js": {
"version": "1.0.2", "version": "1.2.0",
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
"peer": true, "peer": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
@ -192,9 +212,9 @@
} }
}, },
"nanoid": { "nanoid": {
"version": "3.3.6", "version": "3.3.7",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
"peer": true "peer": true
}, },
"picocolors": { "picocolors": {
@ -204,14 +224,14 @@
"peer": true "peer": true
}, },
"postcss": { "postcss": {
"version": "8.4.27", "version": "8.4.38",
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
"integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
"peer": true, "peer": true,
"requires": { "requires": {
"nanoid": "^3.3.6", "nanoid": "^3.3.7",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.2" "source-map-js": "^1.2.0"
} }
}, },
"source-map": { "source-map": {
@ -221,9 +241,9 @@
"peer": true "peer": true
}, },
"source-map-js": { "source-map-js": {
"version": "1.0.2", "version": "1.2.0",
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
"peer": true "peer": true
}, },
"vue": { "vue": {

4
pages/apply/subPages/HM/2riskRecordEdit.vue
View File

@ -465,9 +465,9 @@
i].Nav_Identifying.NAME; i].Nav_Identifying.NAME;
} }
} }
let strPosts = ''
if (res.Nav_Details && res.Nav_Details.length > 0) { if (res.Nav_Details && res.Nav_Details.length > 0) {
for (let i = 0; i < res.Nav_Details.length; i++) { 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++) { for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordWorkduty.length; j++) {
strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Details[i] strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Details[i]
.Nav_EvaluateRiskRecordWorkduty[ .Nav_EvaluateRiskRecordWorkduty[
@ -476,9 +476,9 @@
this.model.Nav_Details[i].Posts = strPosts; this.model.Nav_Details[i].Posts = strPosts;
} }
} }
let strEqus = ''
if (res.Nav_Details && res.Nav_Details.length > 0) { if (res.Nav_Details && res.Nav_Details.length > 0) {
for (let i = 0; i < res.Nav_Details.length; i++) { 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++) { for (let j = 0; j < res.Nav_Details[i].Nav_EvaluateRiskRecordEquipment.length; j++) {
strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Details[i] strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Details[i]
.Nav_EvaluateRiskRecordEquipment[ .Nav_EvaluateRiskRecordEquipment[

15
pages/apply/subPages/HM/4riskShow.vue
View File

@ -17,10 +17,10 @@
<u-form-item label="岗位：" prop="Posts" borderBottom> <u-form-item label="岗位：" prop="Posts" borderBottom>
</u-form-item> </u-form-item>
<u--textarea v-model="model.Posts" border="none" inputAlign="right" disabled></u--textarea> <u--textarea v-model="model.Posts" border="none" inputAlign="right" disabled></u--textarea>
<u-form-item label="作业环节：" prop="Nav_OperationStep.NAME" borderBottom> <!-- <u-form-item label="作业环节：" prop="Nav_OperationStep.NAME" borderBottom>
<u--input v-model="model.Nav_OperationStep.NAME" border="none" slot="right" inputAlign="right" <u--input v-model="model.Nav_OperationStep.NAME" border="none" slot="right" inputAlign="right"
disabled disabledColor="#fff"></u--input> disabled disabledColor="#fff"></u--input>
</u-form-item> </u-form-item> -->
<u-form-item label="辨识对象：" prop="Nav_Identifying.NAME" borderBottom> <u-form-item label="辨识对象：" prop="Nav_Identifying.NAME" borderBottom>
<u--input v-model="model.Nav_Identifying.NAME" border="none" slot="right" inputAlign="right" <u--input v-model="model.Nav_Identifying.NAME" border="none" slot="right" inputAlign="right"
@ -191,20 +191,17 @@
}) })
}, },
transRiskLevel(level) { transRiskLevel(level) {
if (level == 0) {
return '部门 ';
}
if (level == 10) { if (level == 10) {
return '1级'; return '重大风险';
} }
if (level == 20) { if (level == 20) {
return '2级'; return '较大风险';
} }
if (level == 30) { if (level == 30) {
return '3级'; return '一般风险';
} }
if (level == 40) { if (level == 40) {
return '4级'; return '低风险';
} }
}, },
transLevel(level) { transLevel(level) {

144
pages/apply/subPages/HM/6evaluateEdit.vue
View File

@ -99,10 +99,10 @@
disabled disabledColor="#fff"></u--input> disabled disabledColor="#fff"></u--input>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false" <u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskIndividualMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskIndividualMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text>
</view> </view>
@ -112,11 +112,11 @@
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false" <u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEngineeringMeasures" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEngineeringMeasures" :key="k"
:key="k" class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text>
</view> </view>
<u-icon class="icon" name="arrow-down"> <u-icon class="icon" name="arrow-down">
@ -125,10 +125,10 @@
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false" <u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskManagementMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskManagementMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text>
</view> </view>
@ -138,10 +138,10 @@
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false" <u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEducationMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEducationMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text>
</view> </view>
@ -151,10 +151,10 @@
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false" <u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEmergencyMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEmergencyMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text>
</view> </view>
@ -211,8 +211,8 @@
inputAlign="right" disabled disabledColor="#fff"></u--input> inputAlign="right" disabled disabledColor="#fff"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="职业危害位置：" prop="HAZARD_POSITION" borderBottom> <u-form-item label="职业危害位置：" prop="HAZARD_POSITION" borderBottom>
<u--input v-model="item.HAZARD_POSITION" placeholder="职业危害位置" border="none" inputAlign="right" <u--input v-model="item.HAZARD_POSITION" placeholder="职业危害位置" border="none"
disabled disabledColor="#fff"></u--input> inputAlign="right" disabled disabledColor="#fff"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="风险地点：" prop="RISK_PLACE" borderBottom> <u-form-item label="风险地点：" prop="RISK_PLACE" borderBottom>
<u--input v-model="item.RISK_PLACE" border="none" inputAlign="right" disabled <u--input v-model="item.RISK_PLACE" border="none" inputAlign="right" disabled
@ -252,10 +252,10 @@
disabled disabledColor="#fff"></u--input> disabled disabledColor="#fff"></u--input>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false" <u-form-item class="custom-form-item" label="个体防护措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Individual', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskIndividualMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskIndividualMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_IndividualMeasures.NAME"></u--text>
</view> </view>
@ -263,25 +263,25 @@
</u-icon> </u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false" <u-form-item class="custom-form-item" label="工程控制措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Engineering', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEngineeringMeasures" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEngineeringMeasures" :key="k"
:key="k" class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EngineeringMeasures.NAME"></u--text>
</view> </view>
<u-icon class="icon" name="arrow-down"> <u-icon class="icon" name="arrow-down">
</u-icon> </u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false" <u-form-item class="custom-form-item" label="管理控制措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Management', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Management', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskManagementMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskManagementMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_ManagementMeasures.NAME"></u--text>
</view> </view>
@ -289,12 +289,12 @@
</u-icon> </u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false" <u-form-item class="custom-form-item" label="教育培训措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Education', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Education', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEducationMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEducationMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EducationMeasures.NAME"></u--text>
</view> </view>
@ -302,12 +302,12 @@
</u-icon> </u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false" <u-form-item class="custom-form-item" label="应急处置措施" :borderBottom="false"
@click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true})"> @click="handleQuerySelect({ formIndex: 'Emergency', isMultiple: true,itemIndex:index})">
<view slot="right" class="custom-form-item-right"> <view slot="right" class="custom-form-item-right">
<view class="multi"> <view class="multi">
<u--text v-for="(i, k) in model.Nav_EvaluateRiskEmergencyMeasures" :key="k" <u--text v-for="(i, k) in item.Nav_EvaluateRiskEmergencyMeasures" :key="k"
class="item" class="item"
:text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text> :text="k + 1 + '. ' + i.Nav_EmergencyMeasures.NAME"></u--text>
</view> </view>
@ -396,6 +396,7 @@
show: false, show: false,
lists: [], lists: [],
formIndex: undefined, formIndex: undefined,
itemIndex: undefined,
isMultiple: false, isMultiple: false,
defaultChecked: [] defaultChecked: []
}, },
@ -430,6 +431,7 @@
this.qsCom = { this.qsCom = {
show: true, show: true,
formIndex: opt.formIndex, formIndex: opt.formIndex,
itemIndex: opt.itemIndex,
isMultiple: opt.isMultiple, isMultiple: opt.isMultiple,
lists: column lists: column
} }
@ -497,9 +499,10 @@
onSelectedQS(val) { onSelectedQS(val) {
const { const {
formIndex, formIndex,
itemIndex,
} = this.qsCom } = this.qsCom
if (formIndex == "Individual") { if (formIndex == "Individual") {
this.model.Nav_EvaluateRiskIndividualMeasures = []; this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskIndividualMeasures = [];
val.forEach(item => { val.forEach(item => {
let obj = { let obj = {
INDIVIDUAL_MEASURES_ID: item.ID, INDIVIDUAL_MEASURES_ID: item.ID,
@ -507,13 +510,14 @@
NAME: item.NAME NAME: item.NAME
}, },
ID: guid(), ID: guid(),
EVALUATION_RESULT_RISK_ID: this.model.ID, EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID,
ORG_ID: this.ORG_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") { } else if (formIndex == "Engineering") {
this.model.Nav_EvaluateRiskEngineeringMeasures = []; this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEngineeringMeasures = [];
val.forEach(item => { val.forEach(item => {
let obj = { let obj = {
ENGINEERING_MEASURES_ID: item.ID, ENGINEERING_MEASURES_ID: item.ID,
@ -521,13 +525,14 @@
NAME: item.NAME NAME: item.NAME
}, },
ID: guid(), ID: guid(),
EVALUATION_RESULT_RISK_ID: this.model.ID, EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID,
ORG_ID: this.ORG_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") { } else if (formIndex == "Management") {
this.model.Nav_EvaluateRiskManagementMeasures = []; this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskManagementMeasures = [];
val.forEach(item => { val.forEach(item => {
let obj = { let obj = {
MANAGEMENT_MEASURES_ID: item.ID, MANAGEMENT_MEASURES_ID: item.ID,
@ -535,13 +540,14 @@
NAME: item.NAME NAME: item.NAME
}, },
ID: guid(), ID: guid(),
EVALUATION_RESULT_RISK_ID: this.model.ID, EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID,
ORG_ID: this.ORG_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") { } else if (formIndex == "Education") {
this.model.Nav_EvaluateRiskEducationMeasures = []; this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEducationMeasures = [];
val.forEach(item => { val.forEach(item => {
let obj = { let obj = {
EDUCATION_MEASURES_ID: item.ID, EDUCATION_MEASURES_ID: item.ID,
@ -549,13 +555,14 @@
NAME: item.NAME NAME: item.NAME
}, },
ID: guid(), ID: guid(),
EVALUATION_RESULT_RISK_ID: this.model.ID, EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID,
ORG_ID: this.ORG_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") { } else if (formIndex == "Emergency") {
this.model.Nav_EvaluateRiskEmergencyMeasures = []; this.model.Nav_Risks[itemIndex].Nav_EvaluateRiskEmergencyMeasures = [];
val.forEach(item => { val.forEach(item => {
let obj = { let obj = {
EMERGENCY_MEASURES_ID: item.ID, EMERGENCY_MEASURES_ID: item.ID,
@ -563,10 +570,11 @@
NAME: item.NAME NAME: item.NAME
}, },
ID: guid(), ID: guid(),
EVALUATION_RESULT_RISK_ID: this.model.ID, EVALUATION_RESULT_RISK_ID: this.model.Nav_Risks[itemIndex].ID,
ORG_ID: this.ORG_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 = []; this.qsCom.defaultChecked = [];
@ -597,9 +605,9 @@
this.AUDIT_OPINION = refusRes; this.AUDIT_OPINION = refusRes;
}) })
} }
let strPosts = ''
if (res.Nav_Risks && res.Nav_Risks.length > 0) { if (res.Nav_Risks && res.Nav_Risks.length > 0) {
for (let i = 0; i < res.Nav_Risks.length; i++) { 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++) { for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskWorkduty.length; j++) {
strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Risks[i] strPosts += (strPosts.length > 0 ? " " : "") + res.Nav_Risks[i]
.Nav_EvaluateRiskWorkduty[ .Nav_EvaluateRiskWorkduty[
@ -618,9 +626,9 @@
this.model.Nav_Risks[i].Posts = strPosts; this.model.Nav_Risks[i].Posts = strPosts;
} }
} }
let strEqus = ''
if (res.Nav_Risks && res.Nav_Risks.length > 0) { if (res.Nav_Risks && res.Nav_Risks.length > 0) {
for (let i = 0; i < res.Nav_Risks.length; i++) { 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++) { for (let j = 0; j < res.Nav_Risks[i].Nav_EvaluateRiskEquipment.length; j++) {
strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Risks[i] strEqus += (strEqus.length > 0 ? " " : "") + res.Nav_Risks[i]
.Nav_EvaluateRiskEquipment[ .Nav_EvaluateRiskEquipment[
@ -670,14 +678,46 @@
this.model.ORG_ID = this.ORG_ID; this.model.ORG_ID = this.ORG_ID;
} }
this.model.Nav_Files = null; this.model.Nav_Files = null;
this.model.Nav_Risks.forEach(item => { this.model.Nav_Risks.forEach(item => {
item.Nav_EvaluateRiskWorkduty = null; item.Nav_EvaluateRiskWorkduty.forEach(item1 => {
item.Nav_EvaluateRiskEquipment = null; item1.Nav_Post = null;
item.Nav_EvaluateRiskIndividualMeasures = null; });
item.Nav_EvaluateRiskEngineeringMeasures = null; item.Nav_EvaluateRiskEquipment.forEach(item1 => {
item.Nav_EvaluateRiskManagementMeasures = null; item1.Nav_Equipment = null;
item.Nav_EvaluateRiskEducationMeasures = null; });
item.Nav_EvaluateRiskEmergencyMeasures = 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 const ele = this.$refs
//ele['wForm'].validate().then(res => { //ele['wForm'].validate().then(res => {

2
pages/index/index2.nvue
View File

@ -144,7 +144,7 @@
noticeTotal: 0, noticeTotal: 0,
lists: [], lists: [],
banners: [ banners: [
'../../static/banner5.jpg', // '../../static/banner5.jpg',
'../../static/banner6.jpg', '../../static/banner6.jpg',
'../../static/banner7.png' '../../static/banner7.png'
], ],

6
pages/my/subPages/userInfo1.vue
View File

@ -21,12 +21,12 @@
inputAlign="left"></u--input> --> inputAlign="left"></u--input> -->
<text>{{userInfo.ID_CARD}}</text> <text>{{userInfo.ID_CARD}}</text>
</u-form-item> </u-form-item>
<u-form-item label="部门" prop="department" border-bottom> <u-form-item label="组织结构" prop="department" border-bottom>
<text>{{userInfo.DepartmentName}}</text> <text>{{userInfo.DepartmentName}}</text>
</u-form-item> </u-form-item>
<u-form-item label="班组" prop="post" border-bottom> <!-- <u-form-item label="班组" prop="post" border-bottom>
<text>{{userInfo.TeamName}}</text> <text>{{userInfo.TeamName}}</text>
</u-form-item> </u-form-item> -->
<u-form-item label="岗位" prop="job"> <u-form-item label="岗位" prop="job">
<text>{{userInfo.PostName}}</text> <text>{{userInfo.PostName}}</text>
</u-form-item> </u-form-item>

3
pages/performance/index1.vue
View File

@ -598,7 +598,8 @@
async getRiskLevel() { async getRiskLevel() {
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
let json = initFilter(orgId); let json = initFilter(orgId);
extendOrder(json, "CREATE_TIME", 0); // extendOrder(json, "CREATE_TIME", 0);
extendOrder(json, "NUM", 0);
// extendRule(json, "COLOR", 1, ); // extendRule(json, "COLOR", 1, );
const res = await getRiskLevel(json) const res = await getRiskLevel(json)
if (res.IsSuccessful) { if (res.IsSuccessful) {

126
yarn.lock
View File

@ -3,86 +3,86 @@
"@babel/parser@^7.18.4": "@babel/parser@^7.18.4":
"integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==" version "7.22.7"
"resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz" resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
"version" "7.22.7" integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
"@vue/compiler-sfc@2.7.14": "@vue/compiler-sfc@2.7.14":
"integrity" "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==" version "2.7.14"
"resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz" resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
"version" "2.7.14" integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
dependencies: dependencies:
"@babel/parser" "^7.18.4" "@babel/parser" "^7.18.4"
"postcss" "^8.4.14" postcss "^8.4.14"
"source-map" "^0.6.1" source-map "^0.6.1"
"charenc@0.0.2": charenc@0.0.2:
"integrity" "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" version "0.0.2"
"resolved" "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz" resolved "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz"
"version" "0.0.2" integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
"crypt@0.0.2": crypt@0.0.2:
"integrity" "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==" version "0.0.2"
"resolved" "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz" resolved "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz"
"version" "0.0.2" integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
"csstype@^3.1.0": csstype@^3.1.0:
"integrity" "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" version "3.1.2"
"resolved" "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz" resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz"
"version" "3.1.2" integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
"is-buffer@~1.1.6": is-buffer@~1.1.6:
"integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" version "1.1.6"
"resolved" "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz" resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz"
"version" "1.1.6" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
"md5@^2.3.0": md5@^2.3.0:
"integrity" "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==" version "2.3.0"
"resolved" "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz" resolved "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz"
"version" "2.3.0" integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
dependencies: dependencies:
"charenc" "0.0.2" charenc "0.0.2"
"crypt" "0.0.2" crypt "0.0.2"
"is-buffer" "~1.1.6" is-buffer "~1.1.6"
"nanoid@^3.3.6": nanoid@^3.3.7:
"integrity" "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" version "3.3.7"
"resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
"version" "3.3.6" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
"picocolors@^1.0.0": picocolors@^1.0.0:
"integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" version "1.0.0"
"resolved" "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz" resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz"
"version" "1.0.0" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
"postcss@^8.4.14": postcss@^8.4.14:
"integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==" version "8.4.38"
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz"
"version" "8.4.27" integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
dependencies: dependencies:
"nanoid" "^3.3.6" nanoid "^3.3.7"
"picocolors" "^1.0.0" picocolors "^1.0.0"
"source-map-js" "^1.0.2" source-map-js "^1.2.0"
"source-map-js@^1.0.2": source-map-js@^1.2.0:
"integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" version "1.2.0"
"resolved" "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
"version" "1.0.2" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
"source-map@^0.6.1": source-map@^0.6.1:
"integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" version "0.6.1"
"resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz" resolved "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
"version" "0.6.1" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
"vue@^2.0.0": vue@^2.0.0:
"integrity" "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==" version "2.7.14"
"resolved" "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz" resolved "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz"
"version" "2.7.14" integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
dependencies: dependencies:
"@vue/compiler-sfc" "2.7.14" "@vue/compiler-sfc" "2.7.14"
"csstype" "^3.1.0" csstype "^3.1.0"
"vuex@3": vuex@3:
"integrity" "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==" version "3.6.2"
"resolved" "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz" resolved "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz"
"version" "3.6.2" integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==