Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev

This commit is contained in:
骆乐 2022-07-18 15:58:58 +08:00
commit 63f0b68157

View File

@ -37,6 +37,7 @@
<el-button type="warning" plain @click="resetForm"> <el-button type="warning" plain @click="resetForm">
{{ $t("message.personnelPosition.beaconManage.refresh") }} {{ $t("message.personnelPosition.beaconManage.refresh") }}
</el-button> </el-button>
<!-- 添加安全教育培训 -->
<el-button type="primary" @click="addPoint"> <el-button type="primary" @click="addPoint">
{{ $t("message.laborDev.addSafeTrain") }} {{ $t("message.laborDev.addSafeTrain") }}
</el-button> </el-button>
@ -62,7 +63,9 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="handleDetail(scope.row.id)" class="pointer">
{{ educateTypeList[scope.row.eduType - 1] }} {{ educateTypeList[scope.row.eduType - 1] }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -432,6 +435,66 @@
></selectWorker> ></selectWorker>
</div> </div>
</el-dialog> </el-dialog>
<!-- 详情查看 -->
<el-dialog
:modal-append-to-body="false"
title="培训详情"
:visible.sync="detailDialog"
width="980px"
>
<el-descriptions title="培训信息" :column="2">
<el-descriptions-item label="教育类型">{{cardForm.eduType}}</el-descriptions-item>
<el-descriptions-item label="培训主题">{{cardForm.eduCourseName}}</el-descriptions-item>
<el-descriptions-item label="培训日期">{{cardForm.eduTime}}</el-descriptions-item>
<el-descriptions-item label="培训时间"> {{cardForm.eduStartTime + '至' +cardForm.eduEndTime}} </el-descriptions-item>
<el-descriptions-item label="培训人">{{cardForm.eduTeacher}}</el-descriptions-item>
<el-descriptions-item label="培训课时"> {{cardForm.eduClasshour}} </el-descriptions-item>
<el-descriptions-item label="教学视频">
<template v-if="cardForm.uploadAttachments">
<video width="120" height="80" controls autoplay style="margin-left: 10px">
<source :src="$store.state.FILEURL + cardForm.uploadAttachments" type="video/mp4">
<source :src="$store.state.FILEURL + cardForm.uploadAttachments" type="video/ogg">
<source :src="$store.state.FILEURL + cardForm.uploadAttachments" type="video/x-ms-wmv">
您的浏览器不支持 video 标签
</video>
</template>
</el-descriptions-item>
<el-descriptions-item label="培训照片">
<img :src="$store.state.FILEURL + cardForm.eduBeforePhoto" width="120" height="80">
<img :src="$store.state.FILEURL + cardForm.eduInPhoto" width="120" height="80">
<img :src="$store.state.FILEURL + cardForm.eduAfterPhoto" width="120" height="80">
</el-descriptions-item>
<el-descriptions-item label="培训人数" w> {{cardForm.list.length}} </el-descriptions-item>
</el-descriptions>
<el-table
class="tables dialogTable"
:data="cardForm.list"
height="300"
>
<el-table-column :label="$t('message.laborMange.compellation')">
<template slot-scope="scope">{{ scope.row.workerName }}</template>
</el-table-column>
<el-table-column prop="sex" :label="$t('message.laborMange.sex')">
<template slot-scope="scope">{{
scope.row.sex == 1
? $t("message.laborMange.man")
: $t("message.laborMange.female")
}}</template>
</el-table-column>
<el-table-column prop="age" :label="$t('message.laborMange.age')"> </el-table-column>
<el-table-column prop="idCard" :label="$t('message.laborMange.IdNumber')" > </el-table-column>
<el-table-column prop="teamName" :label="$t('message.laborMange.team')" > </el-table-column>
<el-table-column prop="isQualified" :label="$t('message.laborDev.isQualified')" >
<template slot-scope="scope">
{{scope.row.isQualified === 1 ? "合格" : '不合格'}}
</template>
</el-table-column>
<el-table-column prop="score" :label="$t('message.laborDev.score')"></el-table-column>
</el-table>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -495,6 +558,7 @@ export default {
allPersonList: [], allPersonList: [],
educateTypeList: this.$t("message.laborDev.educateTypeList"), educateTypeList: this.$t("message.laborDev.educateTypeList"),
selectWorkerDialog: false, selectWorkerDialog: false,
detailDialog: false
}; };
}, },
mounted() { mounted() {
@ -716,6 +780,17 @@ export default {
this.$refs["searchForm"].resetFields(); this.$refs["searchForm"].resetFields();
this.loadCardData(); this.loadCardData();
}, },
handleDetail(id) {
this.detailDialog = true
workerSafeEducationDetailApi({
id: id,
projectSn: this.$store.state.projectSn,
}).then((res) => {
this.cardForm = res.result.workerSafeEducation;
this.cardForm.list = res.result.list;
console.log(this.cardForm,'但是现实是');
});
},
// //
handleSizeChange(val) { handleSizeChange(val) {
@ -808,4 +883,10 @@ export default {
margin-left: 10px; margin-left: 10px;
} }
} }
/deep/.el-descriptions-item{
width: 200px
}
.pointer{
cursor: pointer;
}
</style> </style>