admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改人员部分BUG

Browse Source
This commit is contained in:
杜海鹏 2022-06-09 14:01:13 +08:00
parent fa3b9b9e32
commit 776f3d0409
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -767,12 +767,13 @@ export default {
safetyEducation: '安全教育', safetyEducation: '安全教育',
trainingDate: '培训日期', trainingDate: '培训日期',
trainingType: '培训类型', trainingType: '培训类型',
schoolEducation: '培训学校培训',
level3Education: '入场三级教育', level3Education: '入场三级教育',
regularSafetyEducation: '定期安全教育', regularSafetyEducation: '定期安全教育',
safetyAndTechnology: '安全技术交底', safetyAndTechnology: '安全技术交底',
VRSafetyEducation: 'VR安全教育', VRSafetyEducation: 'VR安全教育',
trainingTopic: '培训主题', trainingTopic: '培训主题',
courseHours: '培训课时', courseHours: '培训时间',
trainingScore: '培训得分', trainingScore: '培训得分',
qualifiedOrNot: '是否合格', qualifiedOrNot: '是否合格',
qualified: '合格', qualified: '合格',

34
src/views/projectFront/laborManage/personDetails.vue
View File

@ -1716,40 +1716,24 @@
prop="eduTime" prop="eduTime"
:label="$t('message.laborMange.trainingDate')" :label="$t('message.laborMange.trainingDate')"
></el-table-column> ></el-table-column>
<el-table-column
prop="eduType"
:label="$t('message.laborMange.trainingType')"
>
<template slot-scope="scope">
{{
scope.row.eduType == 1
? $t("message.laborMange.level3Education")
: scope.row.eduType == 2
? $t("message.laborMange.regularSafetyEducation")
: scope.row.eduType == 3
? $t("message.laborMange.safetyAndTechnology")
: scope.row.eduType == 4
? $t("message.laborMange.VRSafetyEducation")
: ""
}}
</template>
</el-table-column>
<el-table-column <el-table-column
prop="eduCourseName" prop="eduCourseName"
:label="$t('message.laborMange.trainingTopic')" :label="$t('message.laborMange.trainingTopic')"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="eduClasshour" <!-- <el-table-column
prop="eduTime"
:label="$t('message.laborMange.courseHours')" :label="$t('message.laborMange.courseHours')"
> >
</el-table-column> </el-table-column> -->
<el-table-column <!-- <el-table-column
prop="score" prop="score"
:label="$t('message.laborMange.trainingScore')" :label="$t('message.laborMange.trainingScore')"
> >
</el-table-column> </el-table-column> -->
<el-table-column <!-- <el-table-column
prop="isQualified" prop="isQualified"
:label="$t('message.laborMange.qualifiedOrNot')" :label="$t('message.laborMange.qualifiedOrNot')"
> >
@ -1760,7 +1744,7 @@
: $t("message.laborMange.disqualification") : $t("message.laborMange.disqualification")
}} }}
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>

7
src/views/projectFront/laborManage/safeeducation/index.vue
View File

@ -28,6 +28,13 @@
prop="eduCourseName" prop="eduCourseName"
label="培训类型" label="培训类型"
width="180"> width="180">
</el-table-column>
<el-table-column align="center"
label="是否合格">
<template slot-scope="scope">
<span v-if="scope.row.isQualified == 1">合格</span>
<span v-else>不合格</span>
</template>
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="teamName" prop="teamName"