diff --git a/web/.env b/web/.env index 38d92c5..ddc454c 100644 --- a/web/.env +++ b/web/.env @@ -13,6 +13,8 @@ VITE_APP_TENANT_ENABLE=true # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=false +# 地图瓦片URL +VITE_APP_MAP_TILE_URL = https://webrd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z} # 默认账户密码 VITE_APP_DEFAULT_LOGIN_TENANT = 系统租户 diff --git a/web/src/api/gas/handdetector/index.ts b/web/src/api/gas/handdetector/index.ts index 9210a3d..ba1c883 100644 --- a/web/src/api/gas/handdetector/index.ts +++ b/web/src/api/gas/handdetector/index.ts @@ -24,6 +24,7 @@ export interface HandDetector { accuracy?: number // 数值除数 sortOrder?: number // 排序 remark?: string // 备注 + deptId?: number // 部门ID } // GAS手持探测器报警信息 export interface HandDetectorData extends HandDetector { diff --git a/web/src/api/gas/personnel/index.ts b/web/src/api/gas/personnel/index.ts index c964dbe..01fb3e9 100644 --- a/web/src/api/gas/personnel/index.ts +++ b/web/src/api/gas/personnel/index.ts @@ -10,6 +10,7 @@ export interface Personnel { phone: string; // 联系电话 email: string; // 电子邮箱 status?: number; // 状态 (1-在职, 0-离职) + deptId?: number; // 部门ID } // 人员信息 API diff --git a/web/src/views/gas/handdetector/HandDetectorForm.vue b/web/src/views/gas/handdetector/HandDetectorForm.vue index 642ba14..645b1ad 100644 --- a/web/src/views/gas/handdetector/HandDetectorForm.vue +++ b/web/src/views/gas/handdetector/HandDetectorForm.vue @@ -159,7 +159,8 @@ const formData = ref({ enableStatus: 1, accuracy: 1, sortOrder: undefined, - remark: undefined + remark: undefined, + deptId: undefined }) const formRules = reactive({ sn: [{ required: true, message: 'SN不能为空', trigger: 'blur' }], @@ -181,6 +182,8 @@ const getAllPersonnel = async () => { /** 持有人改变时,应用持有人姓名 */ const handlePersonIdChange = () => { formData.value.name = personnelList.value.find((item) => item.id === formData.value.personId)?.name + formData.value.deptId = personnelList.value.find((item) => item.id === formData.value.personId)?.deptId + } diff --git a/web/src/views/gas/personnel/PersonnelForm.vue b/web/src/views/gas/personnel/PersonnelForm.vue index fa78f88..4f85005 100644 --- a/web/src/views/gas/personnel/PersonnelForm.vue +++ b/web/src/views/gas/personnel/PersonnelForm.vue @@ -13,8 +13,18 @@ + + + + + - + ([]) // 系统用户列表 +const deptList = ref([]) // 部门列表 + +function getDeptList() { + DeptApi.getSimpleDeptList().then((res) => { + deptList.value = res || [] + }) +} + function getUserList() { getSimpleUserList().then((res) => { userList.value = res || [] @@ -91,6 +110,7 @@ const open = async (type: string, id?: number) => { formType.value = type resetForm() getUserList() + getDeptList() // 修改时,设置数据 if (id) { formLoading.value = true @@ -136,7 +156,8 @@ const resetForm = () => { userId: undefined, phone: undefined, email: undefined, - status: undefined + status: undefined, + deptId: undefined } formRef.value?.resetFields() } diff --git a/web/src/views/gas/personnel/index.vue b/web/src/views/gas/personnel/index.vue index 085ea49..bcf6492 100644 --- a/web/src/views/gas/personnel/index.vue +++ b/web/src/views/gas/personnel/index.vue @@ -26,6 +26,17 @@ class="!w-240px" /> + + + + + - + 导出 批量删除 @@ -122,25 +128,34 @@ - - + + - + + + + + @@ -197,6 +212,7 @@ import download from '@/utils/download' import { PersonnelApi, Personnel } from '@/api/gas/personnel' import PersonnelForm from './PersonnelForm.vue' import { UserVO, getSimpleUserList } from '@/api/system/user' +import { DeptVO, getSimpleDeptList } from '@/api/system/dept' /** 人员信息 列表 */ defineOptions({ name: 'Personnel' }) @@ -216,12 +232,19 @@ const queryParams = reactive({ phone: undefined, email: undefined, status: undefined, - createTime: [] + createTime: [], + deptId: undefined }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 const userList = ref([]) // 系统用户列表 +const deptList = ref([]) // 部门列表 +function getDeptList() { + getSimpleDeptList().then((res) => { + deptList.value = res || [] + }) +} function getUserList() { getSimpleUserList().then((res) => { userList.value = res || [] @@ -276,15 +299,15 @@ const handleDeleteBatch = async () => { try { // 删除的二次确认 await message.delConfirm() - await PersonnelApi.deletePersonnelList(checkedIds.value); + await PersonnelApi.deletePersonnelList(checkedIds.value) message.success(t('common.delSuccess')) - await getList(); + await getList() } catch {} } const checkedIds = ref([]) const handleRowCheckboxChange = (records: Personnel[]) => { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id) } /** 导出按钮操作 */ @@ -306,5 +329,6 @@ const handleExport = async () => { onMounted(() => { getList() getUserList() + getDeptList() })