LY

master/src/main/java/com/ruoyi/project/configuration/controller/TStaffmgrController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.project.configuration.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.configuration.domain.TStaffmgr;
+import com.ruoyi.project.configuration.service.ITStaffmgrService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 人员信息Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-11
+ */
+@RestController
+@RequestMapping("/configuration/staffmgr")
+public class TStaffmgrController extends BaseController
+{
+    @Autowired
+    private ITStaffmgrService tStaffmgrService;
+
+    /**
+     * 查询人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TStaffmgr tStaffmgr)
+    {
+        startPage();
+        List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:export')")
+    @Log(title = "人员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TStaffmgr tStaffmgr)
+    {
+        List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
+        ExcelUtil<TStaffmgr> util = new ExcelUtil<TStaffmgr>(TStaffmgr.class);
+        return util.exportExcel(list, "staffmgr");
+    }
+
+    /**
+     * 获取人员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tStaffmgrService.selectTStaffmgrById(id));
+    }
+
+    /**
+     * 获取人员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:query')")
+    @GetMapping(value = "/getByIc/{cardId}")
+    public AjaxResult getInfoByIc(@PathVariable("cardId") String cardId)
+    {
+        return AjaxResult.success(tStaffmgrService.selectTStaffmgrByIc(cardId));
+    }
+
+    /**
+     * 新增人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:add')")
+    @Log(title = "人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TStaffmgr tStaffmgr)
+    {
+        return toAjax(tStaffmgrService.insertTStaffmgr(tStaffmgr));
+    }
+
+    /**
+     * 修改人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:edit')")
+    @Log(title = "人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TStaffmgr tStaffmgr)
+    {
+        return toAjax(tStaffmgrService.updateTStaffmgr(tStaffmgr));
+    }
+
+    /**
+     * 删除人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('configuration:staffmgr:remove')")
+    @Log(title = "人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tStaffmgrService.deleteTStaffmgrByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/configuration/domain/TDevice.java

@@ -163,8 +163,7 @@ public class TDevice extends BaseEntity
     }
     public String getDeptName() { return deptName; }
 
-    public void setDeptName(String deptName) { this.deptName = deptName;
-    }
+    public void setDeptName(String deptName) { this.deptName = deptName; }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/configuration/domain/TStaffmgr.java

@@ -0,0 +1,163 @@
+package com.ruoyi.project.configuration.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 人员信息对象 t_staffmgr
+ *
+ * @author ruoyi
+ * @date 2022-01-11
+ */
+public class TStaffmgr extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 删除标识 */
+    private Long delFlag;
+
+    /** 创建人 */
+    private String createrCode;
+
+    /** 创建时间 */
+    private Date createdate;
+
+    /** 修改人 */
+    private String updaterCode;
+
+    /** 修改时间 */
+    private Date updatedate;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 部门编号 */
+    private Long deptId;
+    @Excel(name = "归属部门")
+    private String deptName;
+
+    /** 员工姓名 */
+    @Excel(name = "员工姓名")
+    private String staffName;
+
+    /** 员工IP卡卡号 */
+    @Excel(name = "员工IP卡卡号")
+    private String staffId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setStaffName(String staffName)
+    {
+        this.staffName = staffName;
+    }
+
+    public String getStaffName()
+    {
+        return staffName;
+    }
+    public void setStaffId(String staffId)
+    {
+        this.staffId = staffId;
+    }
+
+    public String getStaffId()
+    {
+        return staffId;
+    }
+    public String getDeptName() { return deptName; }
+
+    public void setDeptName(String deptName) { this.deptName = deptName; }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("staffName", getStaffName())
+            .append("staffId", getStaffId())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/configuration/mapper/TStaffmgrMapper.java

@@ -0,0 +1,71 @@
+package com.ruoyi.project.configuration.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.configuration.domain.TStaffmgr;
+
+/**
+ * 人员信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-11
+ */
+public interface TStaffmgrMapper 
+{
+    /**
+     * 查询人员信息
+     * 
+     * @param id 人员信息ID
+     * @return 人员信息
+     */
+    public TStaffmgr selectTStaffmgrById(Long id);
+
+    /**
+     * 查询人员信息
+     *
+     * @param staffId 人员信息IC卡号
+     * @return 人员信息
+     */
+    public TStaffmgr selectTStaffmgrByIc(String staffId);
+
+    /**
+     * 查询人员信息列表
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 人员信息集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TStaffmgr> selectTStaffmgrList(TStaffmgr tStaffmgr);
+
+    /**
+     * 新增人员信息
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    public int insertTStaffmgr(TStaffmgr tStaffmgr);
+
+    /**
+     * 修改人员信息
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    public int updateTStaffmgr(TStaffmgr tStaffmgr);
+
+    /**
+     * 删除人员信息
+     * 
+     * @param id 人员信息ID
+     * @return 结果
+     */
+    public int deleteTStaffmgrById(Long id);
+
+    /**
+     * 批量删除人员信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTStaffmgrByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/configuration/service/ITStaffmgrService.java

@@ -0,0 +1,69 @@
+package com.ruoyi.project.configuration.service;
+
+import java.util.List;
+import com.ruoyi.project.configuration.domain.TStaffmgr;
+
+/**
+ * 人员信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-11
+ */
+public interface ITStaffmgrService 
+{
+    /**
+     * 查询人员信息
+     * 
+     * @param id 人员信息ID
+     * @return 人员信息
+     */
+    public TStaffmgr selectTStaffmgrById(Long id);
+
+    /**
+     * 查询人员信息
+     *
+     * @param staffId 人员信息IC卡号
+     * @return 人员信息
+     */
+    public TStaffmgr selectTStaffmgrByIc(String staffId);
+
+    /**
+     * 查询人员信息列表
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 人员信息集合
+     */
+    public List<TStaffmgr> selectTStaffmgrList(TStaffmgr tStaffmgr);
+
+    /**
+     * 新增人员信息
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    public int insertTStaffmgr(TStaffmgr tStaffmgr);
+
+    /**
+     * 修改人员信息
+     * 
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    public int updateTStaffmgr(TStaffmgr tStaffmgr);
+
+    /**
+     * 批量删除人员信息
+     * 
+     * @param ids 需要删除的人员信息ID
+     * @return 结果
+     */
+    public int deleteTStaffmgrByIds(Long[] ids);
+
+    /**
+     * 删除人员信息信息
+     * 
+     * @param id 人员信息ID
+     * @return 结果
+     */
+    public int deleteTStaffmgrById(Long id);
+}

master/src/main/java/com/ruoyi/project/configuration/service/impl/TStaffmgrServiceImpl.java

@@ -0,0 +1,106 @@
+package com.ruoyi.project.configuration.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.configuration.mapper.TStaffmgrMapper;
+import com.ruoyi.project.configuration.domain.TStaffmgr;
+import com.ruoyi.project.configuration.service.ITStaffmgrService;
+
+import javax.annotation.Resource;
+
+/**
+ * 人员信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-01-11
+ */
+@Service
+public class TStaffmgrServiceImpl implements ITStaffmgrService
+{
+    @Resource
+    private TStaffmgrMapper tStaffmgrMapper;
+
+    /**
+     * 查询人员信息
+     *
+     * @param id 人员信息ID
+     * @return 人员信息
+     */
+    @Override
+    public TStaffmgr selectTStaffmgrById(Long id)
+    {
+        return tStaffmgrMapper.selectTStaffmgrById(id);
+    }
+
+    /**
+     * 查询人员信息
+     *
+     * @param staffId 人员信息IC卡号
+     * @return 人员信息
+     */
+    @Override
+    public TStaffmgr selectTStaffmgrByIc(String staffId) {
+        return tStaffmgrMapper.selectTStaffmgrByIc(staffId);
+    }
+
+    /**
+     * 查询人员信息列表
+     *
+     * @param tStaffmgr 人员信息
+     * @return 人员信息
+     */
+    @Override
+    public List<TStaffmgr> selectTStaffmgrList(TStaffmgr tStaffmgr)
+    {
+        return tStaffmgrMapper.selectTStaffmgrList(tStaffmgr);
+    }
+
+    /**
+     * 新增人员信息
+     *
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertTStaffmgr(TStaffmgr tStaffmgr)
+    {
+        return tStaffmgrMapper.insertTStaffmgr(tStaffmgr);
+    }
+
+    /**
+     * 修改人员信息
+     *
+     * @param tStaffmgr 人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateTStaffmgr(TStaffmgr tStaffmgr)
+    {
+        return tStaffmgrMapper.updateTStaffmgr(tStaffmgr);
+    }
+
+    /**
+     * 批量删除人员信息
+     *
+     * @param ids 需要删除的人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTStaffmgrByIds(Long[] ids)
+    {
+        return tStaffmgrMapper.deleteTStaffmgrByIds(ids);
+    }
+
+    /**
+     * 删除人员信息信息
+     *
+     * @param id 人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTStaffmgrById(Long id)
+    {
+        return tStaffmgrMapper.deleteTStaffmgrById(id);
+    }
+}

master/src/main/resources/mybatis/configuration/TStaffmgrMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.configuration.mapper.TStaffmgrMapper">
+    
+    <resultMap type="TStaffmgr" id="TStaffmgrResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="staffName"    column="staff_name"    />
+        <result property="staffId"    column="staff_id"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTStaffmgrVo">
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.staff_name, d.staff_id ,s.dept_name from t_staffmgr d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTStaffmgrList" parameterType="TStaffmgr" resultMap="TStaffmgrResult">
+        <include refid="selectTStaffmgrVo"/>
+        <where>  
+            <if test="staffName != null  and staffName != ''"> and staff_name like concat(concat('%', #{staffName}), '%')</if>
+            <if test="staffId != null  and staffId != ''"> and staff_id = #{staffId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTStaffmgrById" parameterType="Long" resultMap="TStaffmgrResult">
+        <include refid="selectTStaffmgrVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTStaffmgrByIc" parameterType="String" resultMap="TStaffmgrResult">
+        <include refid="selectTStaffmgrVo"/>
+        where staff_id = #{staffId}
+    </select>
+        
+    <insert id="insertTStaffmgr" parameterType="TStaffmgr">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_staffmgr.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_staffmgr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="staffName != null">staff_name,</if>
+            <if test="staffId != null">staff_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="staffName != null">#{staffName},</if>
+            <if test="staffId != null">#{staffId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTStaffmgr" parameterType="TStaffmgr">
+        update t_staffmgr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="staffName != null">staff_name = #{staffName},</if>
+            <if test="staffId != null">staff_id = #{staffId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTStaffmgrById" parameterType="Long">
+        update t_staffmgr set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTStaffmgrByIds" parameterType="String">
+        update t_staffmgr set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/configuration/staffmgr.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询人员信息列表
+export function listStaffmgr(query) {
+  return request({
+    url: '/configuration/staffmgr/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询人员信息详细
+export function getStaffmgr(id) {
+  return request({
+    url: '/configuration/staffmgr/' + id,
+    method: 'get'
+  })
+}
+
+// 查询人员信息详细
+export function getStaffmgrByIC(cardId) {
+  return request({
+    url: '/configuration/staffmgr/getByIc/' + cardId,
+    method: 'get'
+  })
+}
+
+// 新增人员信息
+export function addStaffmgr(data) {
+  return request({
+    url: '/configuration/staffmgr',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改人员信息
+export function updateStaffmgr(data) {
+  return request({
+    url: '/configuration/staffmgr',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除人员信息
+export function delStaffmgr(id) {
+  return request({
+    url: '/configuration/staffmgr/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出人员信息
+export function exportStaffmgr(query) {
+  return request({
+    url: '/configuration/staffmgr/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/configuration/staffmgr/index.vue

@@ -0,0 +1,389 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="员工姓名" prop="staffName">
+        <el-input
+          v-model="queryParams.staffName"
+          placeholder="请输入员工姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="员工IP卡卡号" prop="staffId">
+        <el-input
+          v-model="queryParams.staffId"
+          placeholder="请输入员工IP卡卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['configuration:staffmgr:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['configuration:staffmgr:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['configuration:staffmgr:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['configuration:staffmgr:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['configuration:staffmgr:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="staffmgrList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="员工姓名" align="center" prop="staffName" :show-overflow-tooltip="true"/>
+      <el-table-column label="员工IP卡卡号" align="center" prop="staffId" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['configuration:staffmgr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['configuration:staffmgr:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改人员信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="员工姓名" prop="staffName">
+          <el-input v-model="form.staffName" placeholder="请输入员工姓名" />
+        </el-form-item>
+        <el-form-item label="员工IP卡卡号" prop="staffId">
+          <el-input v-model="form.staffId" placeholder="请输入员工IP卡卡号" />
+        </el-form-item>
+        <el-form-item label="归属部门" prop="deptId">
+            <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listStaffmgr, getStaffmgr, delStaffmgr, addStaffmgr, updateStaffmgr, exportStaffmgr, importTemplate} from "@/api/configuration/staffmgr";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Staffmgr",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 人员信息表格数据
+      staffmgrList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/configuration/staffmgr/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        staffName: null,
+        staffId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "唯一标识ID不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门编号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询人员信息列表 */
+    getList() {
+      this.loading = true;
+      listStaffmgr(this.queryParams).then(response => {
+        this.staffmgrList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        staffName: null,
+        staffId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加人员信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStaffmgr(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改人员信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStaffmgr(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStaffmgr(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStaffmgr(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有人员信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStaffmgr(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

ui/src/views/invoicing/hazardwork/index.vue

@@ -1299,7 +1299,8 @@
                   </tr>
                   <tr>
                     <td style="width: 30px; text-align: center;">
-                      <el-checkbox v-model="form.dIsSafeBriefing" true-label="1" false-label="0"
+                      <!--<el-checkbox v-model="form.dIsSafeBriefing" true-label="1" false-label="0"-->
+                      <el-checkbox true-label="1" false-label="0"
                                    @change="dIsSafeBriefingChange"
                                    :disabled="this.form.dIsOtherMeasure!= null?false:true">是
                       </el-checkbox>
@@ -3143,15 +3144,15 @@ export default {
     getSignRes(res) {
       console.log(res)
       if (res.signType == 'hSafeMesSign') {
-        this.form.hSafeMesSign = res.cardId
+        this.form.hSafeMesSign = res.staffName
         this.form.hSafeMesDate = this.dateformat('y-M-d h:m:s')
-        console.log('chuanguolai' + this.form.hSafeMesSign)
+        console.log('刷卡人姓名：' + this.form.hSafeMesSign)
       }
       if (res.signType == 'kConfirmSign') {
-        this.form.kConfirmSign = res.cardId
+        this.form.kConfirmSign = res.staffName
         this.form.kConfirmDate = this.dateformat('y-M-d h:m:s')
         this.$set(this.value1, 0, this.form.kConfirmDate);
-        console.log('chuanguolai' + this.form.kConfirmSign)
+        console.log('刷卡人姓名：' + this.form.kConfirmSign)
       }
     },
     dateformat(params) {

ui/src/views/invoicing/signcard/index.vue

@@ -1,10 +1,14 @@
 <template>
 
-  <el-dialog title="签名" :destroy-on-close="destroy" :visible.sync="visible" width="1200px" append-to-body>
-
-    <p align="center">
-      <textarea rows="20" :value="this.cardId" cols="111"></textarea>
-    </p>
+  <el-dialog title="签名" :destroy-on-close="destroy" :visible.sync="visible" width="800px" append-to-body>
+    <div
+      v-loading="loading"
+      element-loading-text="读卡中"
+      element-loading-spinner="el-icon-loading"
+    >
+      <el-input :value="this.staffInfo.staffId" disabled />
+      <el-input :value="this.staffInfo.staffName" disabled />
+    </div>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">{{ $t('提交') }}</el-button>
       <el-button @click="cancel">{{ $t('取 消') }}</el-button>
@@ -13,10 +17,13 @@
 </template>
 
 <script>
+import { getStaffmgrByIC } from "@/api/configuration/staffmgr";
+
 export default {
   name: 'test',
   data() {
     return {
+      loading: true,
       destroy: true,
       visible: false,
       websock: null,
@@ -24,6 +31,10 @@ export default {
       isComOpen: false,
       cardId: '',
       signType: '',
+      staffInfo: {
+        staffName: null,
+        staffId: null
+      },
     }
   },
   created() {
@@ -103,8 +114,13 @@ export default {
         this.websocketsend("13|beep|" + this.paramStr + "10");
       } else if (resultData.FunctionID == "3") {
         this.disconnect()
+        this.loading = false;
         console.log("找到卡片之后断开websocket连接")
         this.websock.close()
+        this.findStaffmgr(this.cardId)
+        /*this.$nextTick(() => {
+          this.$emit('func',this.staffInfo)
+        })*/
         //寻找卡片
         // let _this = this
         // setTimeout(function (){
@@ -155,6 +171,12 @@ export default {
       }
       return szPara;
     },
+    // 查询IC卡号人员
+    findStaffmgr(cardId) {
+      getStaffmgrByIC(cardId).then(response => {
+        this.staffInfo = response.data
+      });
+    },
     // 取消按钮
     cancel() {
       this.visible = false;
@@ -167,6 +189,7 @@ export default {
       console.log("卡号：" + this.cardId)
       let signRes = {
         cardId: this.cardId,
+        staffName: this.staffInfo.staffName,
         signType: this.signType
       }
       this.$emit('signRes', signRes); //自定义事件，并传参