diff --git a/src/api/system/fileinfo/index.ts b/src/api/system/fileinfo/index.ts new file mode 100644 index 0000000..9c5a40a --- /dev/null +++ b/src/api/system/fileinfo/index.ts @@ -0,0 +1,6 @@ +import request from '@/config/axios' + +// 删除文件 +export const deleteFile = (id: number) => { + return request.delete({ url: '/system/file-info/deleteByInfraId?id=' + id }) +} diff --git a/src/components/UploadFile/UploadFile.vue b/src/components/UploadFile/UploadFile.vue new file mode 100644 index 0000000..bd43b1d --- /dev/null +++ b/src/components/UploadFile/UploadFile.vue @@ -0,0 +1,62 @@ + + + + 点击上传 + + + + + \ No newline at end of file diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 792b528..1f24695 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -58,12 +58,12 @@ import { defineOptions({ name: 'Login' }) const isIpAccess = ref(false) onMounted(() => { - const hostname = window.location.hostname - if (hostname == 'localhost') { - isIpAccess.value = true - } else { - isIpAccess.value = /^(\d{1,3}\.){3}\d{1,3}$/.test(hostname) - } + // const hostname = window.location.hostname + // if (hostname == 'localhost') { + // isIpAccess.value = true + // } else { + // isIpAccess.value = /^(\d{1,3}\.){3}\d{1,3}$/.test(hostname) + // } // 判断是否为IP地址访问 }) const { getPrefixCls } = useDesign() diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue index 267817e..a06ebf6 100644 --- a/src/views/Login/components/QrCodeForm.vue +++ b/src/views/Login/components/QrCodeForm.vue @@ -95,11 +95,13 @@ const refaulst = () => { return } const res = await LoginApi.qrLoginCode({ code: uuid.value }) - intervalId.value && clearInterval(intervalId.value) - authUtil.setToken(res) - await nextTick(() => { - router.push({ path: '/' }) - }) + if (res) { + intervalId.value && clearInterval(intervalId.value) + authUtil.setToken(res) + await nextTick(() => { + router.push({ path: '/' }) + }) + } } catch (error) { console.error('获取扫码状态失败:', error) } diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue index ee92b81..f28274b 100644 --- a/src/views/enterpriseinspections/index.vue +++ b/src/views/enterpriseinspections/index.vue @@ -13,7 +13,7 @@ /> - + - + + + + 已审核 + 未审核 + + diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue index dcccec2..5b05c80 100644 --- a/src/views/enterprises/update.vue +++ b/src/views/enterprises/update.vue @@ -280,7 +280,8 @@ const formData = ref({ enterpriseUserId: undefined, tagIds: undefined, photo: [] as any, - signRadius: 30 + signRadius: 30, + isAudit: 1 } as any) const formRules = reactive({ type: [{ required: true, message: '企业类型不能为空', trigger: 'change' }], diff --git a/src/views/system/dept/DeptForm.vue b/src/views/system/dept/DeptForm.vue index c759ef3..3eb447b 100644 --- a/src/views/system/dept/DeptForm.vue +++ b/src/views/system/dept/DeptForm.vue @@ -24,41 +24,25 @@ - - - - - + - - - - - - - - - 确 定 + + + + 我要删除 + + + 取 消 + 确 定 + diff --git a/src/views/system/jobinfo/index.vue b/src/views/system/jobinfo/index.vue index 70624ef..1da5aae 100644 --- a/src/views/system/jobinfo/index.vue +++ b/src/views/system/jobinfo/index.vue @@ -55,7 +55,7 @@ 下载 @@ -139,18 +139,13 @@ const openForm = (type: string, id?: number) => { /** 导出按钮操作 */ -const handleExport = async () => { - try { - // 导出的二次确认 - await message.exportConfirm() - // 发起导出 - exportLoading.value = true - const data = await JobInfoApi.exportJobInfo(queryParams) - download.excel(data, '工作汇报.xls') - } catch { - } finally { - exportLoading.value = false - } +const handleExport = async (row:any) => { + const link = document.createElement('a') + link.href = row.pdfUrl + link.download = row.title || '未命名文件.pdf' + document.body.appendChild(link) + link.click() + document.body.removeChild(link) } /** 初始化 **/ diff --git a/src/views/system/role/RoleForm.vue b/src/views/system/role/RoleForm.vue index 161b757..aaba8dc 100644 --- a/src/views/system/role/RoleForm.vue +++ b/src/views/system/role/RoleForm.vue @@ -7,10 +7,10 @@ :rules="formRules" label-width="80px" > - + - + @@ -31,8 +31,15 @@ - 确 定 + + + + 我要删除 + + + 取 消 + 确 定 @@ -84,6 +91,19 @@ const open = async (type: string, id?: number) => { } } + +/** 删除按钮操作 */ +const deleteReport = async () => { + try { + // 发起删除 + await RoleApi.deleteRole(formData.value.id) + message.success(t('common.delSuccess')) + // 刷新列表 + dialogVisible.value = false + emit('success') + } catch {} +} + /** 重置表单 */ const resetForm = () => { formData.value = { diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 711e671..5c113b2 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -1,6 +1,6 @@ - + - + - - - - - - - - - - - + - 搜索 + 查询 重置 + + @@ -69,8 +42,7 @@ @@ -79,27 +51,18 @@ - - - - - - - - - - - + + + + @@ -119,36 +82,21 @@ type="primary" @click="openAssignMenuForm(scope.row)" > - 菜单权限 - - - 数据权限 - - - 删除 + 权限 - + :show-page-size="false" + layout="total, prev, pager, next" + v-model:current-page="queryParams.pageNo" + v-model:page-size="queryParams.pageSize" + @change="getList" + class="ml-auto" + /> @@ -160,18 +108,18 @@ + diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index a904f14..43b129f 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -9,14 +9,24 @@ > - - - + + + + {{ dict.label }} + + + + + - + - + - - - + + + + + + - + - - - - - - - - - - - - - - - - + + - - - + + + + - 确 定 + + + + 我要删除 + + + 取 消 + 确 定 + @@ -107,6 +104,10 @@ import * as PostApi from '@/api/system/post' import * as DeptApi from '@/api/system/dept' import * as UserApi from '@/api/system/user' import { FormRules } from 'element-plus' +import * as RoleApi from '@/api/system/role' + +const roleList = ref([] as RoleApi.RoleVO[]) // 角色的列表 + defineOptions({ name: 'SystemUserForm' }) @@ -129,12 +130,14 @@ const formData = ref({ sex: undefined, postIds: [], remark: '', - status: CommonStatusEnum.ENABLE, + status: undefined, roleIds: [], - area: undefined + area: undefined, + avatar: undefined, + }) const formRules = reactive({ - username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }], + realName: [{ required: true, message: '真实姓名不能为空', trigger: 'blur' }], nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }], password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }], email: [ @@ -171,11 +174,25 @@ const open = async (type: string, id?: number) => { formLoading.value = false } } + // 加载部门树 deptList.value = handleTree(await DeptApi.getSimpleDeptList()) + // 加载岗位列表 postList.value = await PostApi.getSimplePostList() + + // 加载角色列表 + roleList.value = await RoleApi.getSimpleRoleList() + } + +const deleteReport = () => { + UserApi.deleteUser(formData.value.id).then(() => { + message.success(t('common.deleteSuccess')) + dialogVisible.value = false + }) +} + defineExpose({ open }) // 提供 open 方法,用于打开弹窗 /** 提交表单 */ @@ -225,3 +242,8 @@ const resetForm = () => { formRef.value?.resetFields() } + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 272dfee..3632e57 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -2,78 +2,44 @@ - + - - - + - - - - 搜索 + 查询 重置 + + - 新增 - - - 导入 - - 导出 + - + {{getDictLabel(DICT_TYPE.SYSTEM_USER_SEX, scope.row.sex)}} - + - + + - + - + - 修改 + 编辑 - handleCommand(command, scope.row)" - v-hasPermi="[ - 'system:user:delete', - 'system:user:update-password', - 'system:permission:assign-user-role' - ]" - > - 更多 - - - - 删除 - - - 测试删除全部数据 - - - 重置密码 - - - 分配角色 - - - - + @@ -204,15 +134,15 @@ + diff --git a/src/views/task/create.vue b/src/views/task/create.vue index 0b17c76..8a0a551 100644 --- a/src/views/task/create.vue +++ b/src/views/task/create.vue @@ -3,9 +3,9 @@ 基本信息 - + - + @@ -20,7 +20,7 @@ /> - + - +