From fa3b9b9e32746a6ba385cad53a52fe330bebddd3 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 13:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManage/safeeducation/index.vue       | 158 ++++++------------
 1 file changed, 47 insertions(+), 111 deletions(-)

diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue
index 98955db7..0c8a8610 100644
--- a/src/views/projectFront/laborManage/safeeducation/index.vue
+++ b/src/views/projectFront/laborManage/safeeducation/index.vue
@@ -2,9 +2,9 @@
 <template>
   <div class="epidemicPrevention">
     <div class="query">
-      <el-form ref="queryParams" :model="queryParams" :inline="true" label-width="120px">
+      <el-form ref="eduType" :model="queryParams" :inline="true" label-width="120px">
         <el-form-item label="培训类型" prop="personType">
-          <el-select v-model="queryParams.personType" placeholder="请选择培训类型" clearable
+          <el-select v-model="queryParams.eduType" placeholder="请选择培训类型" clearable
             :style="{width: '100%'}">
             <el-option v-for="item in personTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -22,112 +22,45 @@
     <div class="content">
       <vue-scroll>
         <div class="scroll">
-          <el-table v-loading="loading" :show-header="false" :data="userList">
-            <el-table-column align="center" prop="month">
-              <template #default="{ row }">
-                <!-- 用户信息 -->
-                <div class="user-info cell-height">
-                  <div class="user-photo">
-                    <el-image :preview-src-list="[$store.state.FILEURL + row.idCardBigPhotoUrl]" :src="$store.state.FILEURL + row.idCardBigPhotoUrl" fit="cover" />
-                  </div>
-                  <div class="user-info-right">
-                    <!-- 人员名称和健康码 -->
-                    <div class="top">
-                      <span class="user-name">{{ row.workerName }}</span>
-                      <span :class="['health-code', returnCodeClass(row.codeState)]">{{ codeStateEnum[row.codeState] }}</span>
-                    </div>
-                    <div class="user-info-bottom">
-                      <span class="user-sex">{{ row.sex == 1 ? '男' : '女' }}</span>
-                      <div class="user-age">
-                        <span class="value">{{ row.age }}</span>
-                        <span class="label">岁</span>
-                      </div>
-                      <span class="user-nation">{{ row.nation }}</span>
-                    </div>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="name">
-              <template #default="{ row }">
-                <!-- 联系电话和班组 -->
-                <div class="space-around cell-height">
-                  <div class="telephone">
-                    <span class="label">联系电话：</span>
-                    <span class="value">{{ row.phoneNumber }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="idCard">
-              <template #default="{ row }">
-                <!-- 进场日期和在职状态 -->
-                <div class="space-around cell-height">
-                  <div class="entry-date">
-                    <span class="label">进场日期：</span>
-                    <span class="value">{{ row.enterDate }}</span>
-                  </div>
-                  <div class="job-status">
-                    <span class="label">在职状态：</span>
-                    <span class="value">{{ workingStateEnum[row.inserviceType] }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="team">
-              <template #default="{ row }">
-                <!-- 身份证号和人员类型 -->
-                <div class="space-around cell-height">
-                  <div class="id-card">
-                    <span class="label">身份证号：</span>
-                    <span class="value">{{ row.idCard }}</span>
-                  </div>
-                  <div class="user-type">
-                    <span class="label">人员类型：</span>
-                    <span class="value">{{ personTypeEnum[row.personType] }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <!-- 所属企业 -->
-            <el-table-column align="center" prop="enterpriseName">
-              <template #default="{ row }">
-                <div class="space-around cell-height">
-                  <div class="company">
-                    <span class="label">所属企业：</span>
-                    <span class="value">{{ row.enterpriseName }}</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center">
-              <template #default="{ row }">
-                <!-- 核酸时间和疫苗接种针次 -->
-                <div class="space-around cell-height">
-                  <div class="dna-time">
-                    <span class="label">核酸时间：</span>
-                    <span class="value">{{ row.nadTime }}</span>
-                    <el-button style="margin-left: 5px" type="text" icon="el-icon-edit" @click="handleUpdate(row, '核酸检测记录')">编辑</el-button>
-                  </div>
-                  <div class="number-of-vaccination">
-                    <span class="label">疫苗接种针次：</span>
-                    <span class="value">{{ vaccineStatusEnum[row.vaccineStatus] }}</span>
-                    <el-button style="margin-left: 5px" type="text" icon="el-icon-edit" @click="handleUpdate(row, '疫苗接种记录')">编辑</el-button>
-                  </div>
-                </div>  
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-row type="flex" justify="center">
-            <pagination
-              v-show="total > 0"
-              :total="total"
-              :page.sync="queryParams.pageNo"
-              :limit.sync="queryParams.pageSize"
-              @pagination="getList"
-              layout="total, prev, pager, next, jumper"
-            />
-          </el-row>
+          <el-table v-loading="loading"  :data="userList">
+           
+            <el-table-column  align="center"
+                  prop="eduCourseName"
+                  label="培训类型"
+                  width="180">
+                </el-table-column>
+                <el-table-column  align="center"
+                  prop="teamName"
+                  label="班组名称"
+                  width="180">
+                </el-table-column>
+                <el-table-column  align="center"
+                  prop="workerName"
+                  label="人员姓名">
+                </el-table-column>
+                <el-table-column  align="center"
+                  prop="idCard"
+                  label="身份证号">
+                </el-table-column>
+                  <el-table-column  align="center"
+                  prop="age"
+                  label="年龄">
+                </el-table-column>
+                    <el-table-column align="center"
+                  prop="studyTime"
+                  label="培训时间">
+                </el-table-column>
+           </el-table>
+            <el-row type="flex" justify="center">
+              <pagination
+                v-show="total > 0"
+                :total="total"
+                :page.sync="queryParams.pageNo"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+                layout="total, prev, pager, next, jumper"
+              />
+            </el-row>
         </div>
       </vue-scroll>
     </div>
@@ -150,12 +83,14 @@ export default {
     personTypeOptions:personTypeOptions,
     // 项目SN
     projectSn: '',
+    loading:false,
     // 查询参数
     queryParams: {
       pageNo: 1,
       pageSize: 10,
       projectSn: undefined, // 项目SN
-      workerName: undefined  // 工人姓名
+      workerName: undefined,  // 工人姓名
+      eduType: undefined  // 培训类型：0其他，1入场三级教育，2定期安全教育，3安全技术交底，4VR安全教育
     },
   }),
   computed: {
@@ -165,15 +100,16 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
-    this.uploadUrl = this.$store.state.UPLOADURL;
     this.getList()
   },
   methods: {
     /** 查询用户数据 */
     getList() {
+       this.userList=[];
       this.loading = true;
       this.queryParams.projectSn = this.projectSn;
       selectSafeEducationWorkerPageApi(this.queryParams).then(res => {
+        
         this.userList = res.result.records;
         this.total = res.result.total
         this.loading = false;
@@ -199,7 +135,7 @@ export default {
     box-sizing: border-box;
     padding: 20px;
     width: 100%;
-    height: 155px;
+    height: 85px;
     background-color: #fff;
     border-bottom: 2px solid #f3f5fd;
   }