Browse Source

人员

master
xh 2 days ago
parent
commit
d0d9d0b815
  1. 3
      web/src/api/gas/handdetector/index.ts
  2. 56
      web/src/api/gas/personnel/index.ts
  3. 3
      web/src/utils/dict.ts
  4. 42
      web/src/views/gas/handdetector/HandDetectorForm.vue
  5. 1
      web/src/views/gas/handdetector/index.vue
  6. 127
      web/src/views/gas/personnel/PersonnelForm.vue
  7. 287
      web/src/views/gas/personnel/index.vue

3
web/src/api/gas/handdetector/index.ts

@ -4,7 +4,8 @@ import request from '@/config/axios'
/** GAS手持探测器信息 */ /** GAS手持探测器信息 */
export interface HandDetector { export interface HandDetector {
id?: number // 主键ID id?: number // 主键ID
sn?: string // SN
sn: string // SN
personId?: number // 持有人ID
name?: string // 持有人 name?: string // 持有人
fenceIds?: string // 围栏ids fenceIds?: string // 围栏ids
fenceIdsArray?: string[] // 围栏ids数组 fenceIdsArray?: string[] // 围栏ids数组

56
web/src/api/gas/personnel/index.ts

@ -0,0 +1,56 @@
import request from '@/config/axios'
import type { Dayjs } from 'dayjs';
/** 人员信息信息 */
export interface Personnel {
id: number; // 主键ID
name?: string; // 姓名
employeeId: string; // 工号
userId: number; // 关联的系统用户ID (关联系统用户表, 可为空)
phone: string; // 联系电话
email: string; // 电子邮箱
status?: number; // 状态 (1-在职, 0-离职)
}
// 人员信息 API
export const PersonnelApi = {
// 查询人员信息分页
getPersonnelPage: async (params: any) => {
return await request.get({ url: `/gas/personnel/page`, params })
},
// 查询人员信息详情
getPersonnel: async (id: number) => {
return await request.get({ url: `/gas/personnel/get?id=` + id })
},
// 新增人员信息
createPersonnel: async (data: Personnel) => {
return await request.post({ url: `/gas/personnel/create`, data })
},
// 修改人员信息
updatePersonnel: async (data: Personnel) => {
return await request.put({ url: `/gas/personnel/update`, data })
},
// 删除人员信息
deletePersonnel: async (id: number) => {
return await request.delete({ url: `/gas/personnel/delete?id=` + id })
},
/** 批量删除人员信息 */
deletePersonnelList: async (ids: number[]) => {
return await request.delete({ url: `/gas/personnel/delete-list?ids=${ids.join(',')}` })
},
// 导出人员信息 Excel
exportPersonnel: async (params) => {
return await request.download({ url: `/gas/personnel/export-excel`, params })
},
// 查询所有人员信息
listAll: async () => {
return await request.get<Personnel[]>({ url: `/gas/personnel/getListAll` })
},
}

3
web/src/utils/dict.ts

@ -175,5 +175,6 @@ export enum DICT_TYPE {
HAND_DETECTOR_FENCE_STATUS = 'hand_detector_fence_status', // HAND 手持探测器围栏状态 1:启用;2:禁用 HAND_DETECTOR_FENCE_STATUS = 'hand_detector_fence_status', // HAND 手持探测器围栏状态 1:启用;2:禁用
HAND_DETECTOR_ALARM_LEVEL = 'hand_detector_alarm_level', // HAND 手持探测器警报方式/级别 0:正常状态;1:一级警报;2:二级警报;3:弹窗警报 HAND_DETECTOR_ALARM_LEVEL = 'hand_detector_alarm_level', // HAND 手持探测器警报方式/级别 0:正常状态;1:一级警报;2:二级警报;3:弹窗警报
HAND_DETECTOR_HANDLE_STATUS = 'hand_detector_chandle_status', // HAND 手持探测器处理状态 0:待处理;1:处理中;1:已处理 HAND_DETECTOR_HANDLE_STATUS = 'hand_detector_chandle_status', // HAND 手持探测器处理状态 0:待处理;1:处理中;1:已处理
HAND_DETECTOR_VALUE_DIRECTION = 'hand_detector_value_direction' // HAND 手持探测器最值方向 0:小;1:大
HAND_DETECTOR_VALUE_DIRECTION = 'hand_detector_value_direction', // HAND 手持探测器最值方向 0:小;1:大
EMPLOYMENT_STATUS = 'employment_status', // 就业状态 0:离职;1:在职
} }

42
web/src/views/gas/handdetector/HandDetectorForm.vue

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<Dialog :title="dialogTitle" v-model="dialogVisible" :scroll="true">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -10,9 +10,19 @@
<el-form-item label="SN" prop="sn"> <el-form-item label="SN" prop="sn">
<el-input v-model="formData.sn" placeholder="请输入SN" /> <el-input v-model="formData.sn" placeholder="请输入SN" />
</el-form-item> </el-form-item>
<el-form-item label="持有人" prop="name">
<el-input v-model="formData.name" placeholder="请输入持有人" />
<el-form-item label="持有人" prop="personId">
<el-select v-model="formData.personId" clearable placeholder="请选择持有人" @change="handlePersonIdChange">
<el-option
v-for="person in personnelList"
:key="person.id"
:label="person.name"
:value="person.id"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="持有人" prop="name">
<el-input v-model="formData.name" placeholder="请输入持有人" />
</el-form-item> -->
<!-- 围栏类型 --> <!-- 围栏类型 -->
<el-form-item label="围栏类型" prop="fenceType"> <el-form-item label="围栏类型" prop="fenceType">
<el-radio-group v-model="formData.fenceType" @change="fenceTypeChange"> <el-radio-group v-model="formData.fenceType" @change="fenceTypeChange">
@ -106,6 +116,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { HandDetectorApi, HandDetector } from '@/api/gas/handdetector' import { HandDetectorApi, HandDetector } from '@/api/gas/handdetector'
import { PersonnelApi, Personnel } from '@/api/gas/personnel'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { Fence } from '@/api/gas/fence' import { Fence } from '@/api/gas/fence'
import { Type } from '@/api/gas/gastype' import { Type } from '@/api/gas/gastype'
@ -131,7 +142,8 @@ const props = defineProps({
}) })
const formData = ref<HandDetector>({ const formData = ref<HandDetector>({
id: undefined, id: undefined,
sn: undefined,
sn: '',
personId: undefined,
name: undefined, name: undefined,
fenceIds: '', fenceIds: '',
fenceIdsArray: [], fenceIdsArray: [],
@ -151,11 +163,27 @@ const formData = ref<HandDetector>({
}) })
const formRules = reactive({ const formRules = reactive({
sn: [{ required: true, message: 'SN不能为空', trigger: 'blur' }], sn: [{ required: true, message: 'SN不能为空', trigger: 'blur' }],
name: [{ required: true, message: '持有人不能为空', trigger: 'blur' }],
personId: [{ required: true, message: '持有人不能为空', trigger: 'blur' }],
// name: [{ required: true, message: '', trigger: 'blur' }],
gasTypeId: [{ required: true, message: '气体类型不能为空', trigger: 'blur' }], gasTypeId: [{ required: true, message: '气体类型不能为空', trigger: 'blur' }],
enableStatus: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }] enableStatus: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
const personnelList = ref<Personnel[]>([])
/** 查询所有人员 */
const getAllPersonnel = async () => {
try {
personnelList.value = await PersonnelApi.listAll()
} catch (error) {
message.error('查询所有人员失败')
}
}
/** 持有人改变时,应用持有人姓名 */
const handlePersonIdChange = () => {
formData.value.name = personnelList.value.find((item) => item.id === formData.value.personId)?.name
}
var selectFences=computed(()=>{ var selectFences=computed(()=>{
return props.fences.filter((item) => item.type === formData.value.fenceType) return props.fences.filter((item) => item.type === formData.value.fenceType)
@ -171,6 +199,7 @@ const open = async (type: string, id?: number) => {
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
resetForm() resetForm()
getAllPersonnel()
// //
if (id) { if (id) {
formLoading.value = true formLoading.value = true
@ -213,7 +242,8 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
sn: undefined,
sn: '',
personId: undefined,
name: undefined, name: undefined,
fenceIds: '', fenceIds: '',
fenceIdsArray: [], fenceIdsArray: [],

1
web/src/views/gas/handdetector/index.vue

@ -17,6 +17,7 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="持有人" prop="name"> <el-form-item label="持有人" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"

127
web/src/views/gas/personnel/PersonnelForm.vue

@ -0,0 +1,127 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="姓名" prop="name">
<el-input v-model="formData.name" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="工号" prop="employeeId">
<el-input v-model="formData.employeeId" placeholder="请输入工号" />
</el-form-item>
<el-form-item label="关联的系统用户" prop="userId">
<el-input v-model="formData.userId" placeholder="" />
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="formData.phone" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="formData.email" placeholder="请输入电子邮箱" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.EMPLOYMENT_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { PersonnelApi, Personnel } from '@/api/gas/personnel'
/** 人员信息 表单 */
defineOptions({ name: 'PersonnelForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
name: undefined,
employeeId: undefined,
userId: undefined,
phone: undefined,
email: undefined,
status: undefined
})
const formRules = reactive({
name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态 (1-在职, 0-离职)不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await PersonnelApi.getPersonnel(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as Personnel
if (formType.value === 'create') {
await PersonnelApi.createPersonnel(data)
message.success(t('common.createSuccess'))
} else {
await PersonnelApi.updatePersonnel(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
name: undefined,
employeeId: undefined,
userId: undefined,
phone: undefined,
email: undefined,
status: undefined
}
formRef.value?.resetFields()
}
</script>

287
web/src/views/gas/personnel/index.vue

@ -0,0 +1,287 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入姓名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="工号" prop="employeeId">
<el-input
v-model="queryParams.employeeId"
placeholder="请输入工号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="关联的系统用户" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入关联的系统用户ID "
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入联系电话"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input
v-model="queryParams.email"
placeholder="请输入电子邮箱"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.EMPLOYMENT_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['gas:personnel:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['gas:personnel:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
<el-button
type="danger"
plain
:disabled="isEmpty(checkedIds)"
@click="handleDeleteBatch"
v-hasPermi="['gas:personnel:delete']"
>
<Icon icon="ep:delete" class="mr-5px" /> 批量删除
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
row-key="id"
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
@selection-change="handleRowCheckboxChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="工号" align="center" prop="employeeId" />
<el-table-column label="关联的系统用户" align="center" prop="userId" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="电子邮箱" align="center" prop="email" />
<el-table-column label="状态 (1-在职, 0-离职)" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.EMPLOYMENT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['gas:personnel:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['gas:personnel:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<PersonnelForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { isEmpty } from '@/utils/is'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { PersonnelApi, Personnel } from '@/api/gas/personnel'
import PersonnelForm from './PersonnelForm.vue'
/** 人员信息 列表 */
defineOptions({ name: 'Personnel' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<Personnel[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
employeeId: undefined,
userId: undefined,
phone: undefined,
email: undefined,
status: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await PersonnelApi.getPersonnelPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await PersonnelApi.deletePersonnel(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 批量删除人员信息 */
const handleDeleteBatch = async () => {
try {
//
await message.delConfirm()
await PersonnelApi.deletePersonnelList(checkedIds.value);
message.success(t('common.delSuccess'))
await getList();
} catch {}
}
const checkedIds = ref<number[]>([])
const handleRowCheckboxChange = (records: Personnel[]) => {
checkedIds.value = records.map((item) => item.id);
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await PersonnelApi.exportPersonnel(queryParams)
download.excel(data, '人员信息.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
Loading…
Cancel
Save