From 08008603687fc8da5a640dadf5bc81024c9c4cb8 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Thu, 7 Mar 2024 09:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=9F=E4=BC=8D=E4=BA=BA=E5=91=98=EF=BC=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/ehs/ehsRescueTeam/tabs_first.vue    | 31 +++++++++++++++++--
 .../views/ehs/ehsRescueTeamWorker/index.vue   | 31 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
index d2a6a29..edec254 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
@@ -88,7 +88,14 @@
         </template>
       </el-table-column>
       <el-table-column label="队伍名称" align="center" prop="rescueTeamName" :show-overflow-tooltip="true"/>
-      <el-table-column label="人员姓名" align="center" prop="workerName" :show-overflow-tooltip="true"/>
+      <el-table-column label="人员姓名" align="center" prop="workerName" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span
+            @click="getWorkerDetail(scope.row)"
+            style="color: blue; cursor: pointer"
+          >{{scope.row.workerName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="年龄" align="center" prop="workerAge" :show-overflow-tooltip="true"/>
       <el-table-column label="性别" align="center" prop="gender" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -104,6 +111,10 @@
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
 
     </el-table>
+    <workerDetail
+      ref="workerDetailRef"
+      :detailData="detailDataWorker"
+    ></workerDetail>
 
     <pagination
       v-show="total > 0"
@@ -119,7 +130,10 @@
 
 <script>
 import { getWorkerInfo } from '@/api/ehs/realdata'
+import { getEhsRescueTeamWorker } from '@/api/ehs/ehsRescueTeamWorker'
+import workerDetail from '@/views/ehs/ehsRescueTeamWorker/workerDetail.vue'
 export default {
+  components: { workerDetail },
   dicts: ['team_property','team_level','sys_user_sex'],
   props: {
     detailData: {
@@ -136,6 +150,8 @@ export default {
       total: 0,
       pageNum: 1,
       pageSize: 10,
+      // 队员详情
+      detailDataWorker: {},
     }
 
   },
@@ -150,7 +166,18 @@ export default {
         this.workerList = res.rows;
         this.loading = false;
       })
-    }
+    },
+    getWorkerDetail(row) {
+      // 获取人员详情
+      getEhsRescueTeamWorker(row.id).then((res) => {
+        if (res.code == 200) {
+          this.detailDataWorker = res.data;
+          this.$refs.workerDetailRef.open = true;
+        } else {
+          this.$message.warning(res.msg);
+        }
+      })
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
index 682423c..df9cd55 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
@@ -152,7 +152,14 @@
       </el-table-column>
 <!--      <el-table-column label="应急救援队伍id" align="center" prop="rescueTeamId" />-->
       <el-table-column label="队伍名称" align="center" prop="rescueTeamName" />
-      <el-table-column label="人员姓名" align="center" prop="workerName" />
+      <el-table-column label="人员姓名" align="center" prop="workerName" >
+        <template slot-scope="scope">
+          <span
+            @click="getWorkerDetail(scope.row)"
+            style="color: blue; cursor: pointer"
+            >{{scope.row.workerName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="年龄" align="center" prop="workerAge" />
       <el-table-column label="性别" align="center" prop="gender">
         <template slot-scope="scope">
@@ -281,6 +288,11 @@
       downUrl="/ehs/ehsRescueTeamWorker/importTemplate"
       temName="应急救援队伍人员导入模板"
     ></importUpload>
+
+    <workerDetail
+      ref="workerDetailRef"
+      :detailData="detailDataWorker"
+    ></workerDetail>
   </div>
 </template>
 
@@ -294,11 +306,13 @@ import {
   getTeamInfo
 } from '@/api/ehs/ehsRescueTeamWorker'
 import importUpload from "@/components/upload/upload";
+import workerDetail from "./workerDetail.vue";
 
 export default {
   name: "EhsRescueTeamWorker",
   components: {
     importUpload,
+    workerDetail,
   },
   dicts: ['sys_user_sex'],
   data() {
@@ -339,6 +353,10 @@ export default {
       },
       // 表单参数
       form: {},
+      // 队员id
+      workerId: null,
+      // 队员详情
+      detailDataWorker: {},
       // 表单校验
       rules: {
         workerName: [
@@ -507,6 +525,17 @@ export default {
       this.$refs.uploadRef.upload.url =
         process.env.VUE_APP_BASE_API + "/ehs/ehsRescueTeamWorker/importData";
     },
+    getWorkerDetail(row) {
+      // 获取人员详情
+      getEhsRescueTeamWorker(row.id).then((res) => {
+        if (res.code == 200) {
+          this.detailDataWorker = res.data;
+          this.$refs.workerDetailRef.open = true;
+        } else {
+          this.$message.warning(res.msg);
+        }
+      })
+    },
     /** 导入成功 */
     upLoadOk() {
       // console.log("导入成功")