From 776f3d0409dc6a0c936fceac1c02b08d67e92f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E6=B5=B7=E9=B9=8F?= <952581343@qq.com>
Date: Thu, 9 Jun 2022 14:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E9=83=A8?=
 =?UTF-8?q?=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i18n/langs/cn/laborManage/personManage.js |  3 +-
 .../laborManage/personDetails.vue             | 34 +++++--------------
 .../laborManage/safeeducation/index.vue       |  7 ++++
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/assets/i18n/langs/cn/laborManage/personManage.js b/src/assets/i18n/langs/cn/laborManage/personManage.js
index 28419eb7..59812369 100644
--- a/src/assets/i18n/langs/cn/laborManage/personManage.js
+++ b/src/assets/i18n/langs/cn/laborManage/personManage.js
@@ -767,12 +767,13 @@ export default {
   safetyEducation: '安全教育',
   trainingDate: '培训日期',
   trainingType: '培训类型',
+  schoolEducation: '培训学校培训',
   level3Education: '入场三级教育',
   regularSafetyEducation: '定期安全教育',
   safetyAndTechnology: '安全技术交底',
   VRSafetyEducation: 'VR安全教育',
   trainingTopic: '培训主题',
-  courseHours: '培训课时',
+  courseHours: '培训时间',
   trainingScore: '培训得分',
   qualifiedOrNot: '是否合格',
   qualified: '合格',
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 25489986..a2fe2937 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -1716,40 +1716,24 @@
                 prop="eduTime"
                 :label="$t('message.laborMange.trainingDate')"
               ></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
                 prop="eduCourseName"
                 :label="$t('message.laborMange.trainingTopic')"
               >
               </el-table-column>
-              <el-table-column
-                prop="eduClasshour"
+              
+              <!-- <el-table-column
+                prop="eduTime"
                 :label="$t('message.laborMange.courseHours')"
               >
-              </el-table-column>
-              <el-table-column
+              </el-table-column> -->
+              <!-- <el-table-column
                 prop="score"
                 :label="$t('message.laborMange.trainingScore')"
               >
-              </el-table-column>
-              <el-table-column
+              </el-table-column> -->
+              <!-- <el-table-column
                 prop="isQualified"
                 :label="$t('message.laborMange.qualifiedOrNot')"
               >
@@ -1760,7 +1744,7 @@
                       : $t("message.laborMange.disqualification")
                   }}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </div>
 
diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue
index 0c8a8610..daf93284 100644
--- a/src/views/projectFront/laborManage/safeeducation/index.vue
+++ b/src/views/projectFront/laborManage/safeeducation/index.vue
@@ -28,6 +28,13 @@
                   prop="eduCourseName"
                   label="培训类型"
                   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  align="center"
                   prop="teamName"