From 67932464793418a70d789ab954130d79fde55351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E6=B5=B7=E9=B9=8F?= <952581343@qq.com>
Date: Sat, 16 Jul 2022 18:12:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E5=AE=8C=E6=88=90=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManage/safetyTrainManage.vue         | 80 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index fba2359f..4c872748 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -37,6 +37,7 @@
           <el-button type="warning" plain @click="resetForm">
             {{ $t("message.personnelPosition.beaconManage.refresh") }}
           </el-button>
+          <!-- 添加安全教育培训 -->
           <el-button type="primary" @click="addPoint">
             {{ $t("message.laborDev.addSafeTrain") }}
           </el-button>
@@ -62,7 +63,9 @@
           align="center"
         >
           <template slot-scope="scope">
-            {{ educateTypeList[scope.row.eduType - 1] }}
+            <div @click="handleDetail(scope.row.id)">  
+              {{ educateTypeList[scope.row.eduType - 1] }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -432,6 +435,66 @@
         ></selectWorker>
       </div>
     </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>
 </template>
 <script>
@@ -495,6 +558,7 @@ export default {
       allPersonList: [],
       educateTypeList: this.$t("message.laborDev.educateTypeList"),
       selectWorkerDialog: false,
+      detailDialog: false
     };
   },
   mounted() {
@@ -716,6 +780,17 @@ export default {
       this.$refs["searchForm"].resetFields();
       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) {
@@ -808,4 +883,7 @@ export default {
     margin-left: 10px;
   }
 }
+/deep/.el-descriptions-item{
+  width: 200px
+}
 </style>

From 6295da7bb79e52798dda66560cd5462675e20deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E6=B5=B7=E9=B9=8F?= <952581343@qq.com>
Date: Sat, 16 Jul 2022 18:28:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E6=9B=B4=E6=94=B9=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=95=99=E8=82=B2=E7=B1=BB=E5=9E=8B=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/laborManage/safetyTrainManage.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index 4c872748..6f2d9e3c 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -63,7 +63,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <div @click="handleDetail(scope.row.id)">  
+            <div @click="handleDetail(scope.row.id)" class="pointer">  
               {{ educateTypeList[scope.row.eduType - 1] }}
             </div>
           </template>
@@ -886,4 +886,7 @@ export default {
 /deep/.el-descriptions-item{
   width: 200px
 }
+.pointer{
+  cursor: pointer;
+}
 </style>