个人中心

tx
tengxi 1 year ago
parent 87d7880c24
commit 9ea53f36d1

@ -7,14 +7,14 @@ VITE_PUBLIC_PATH = /
# 本地开发代理,可以解决跨域及多地址代理 # 本地开发代理,可以解决跨域及多地址代理
# 如果接口地址匹配到则会转发到http://localhost:3000防止本地出现跨域问题 # 如果接口地址匹配到则会转发到http://localhost:3000防止本地出现跨域问题
# 可以有多个,注意多个不能换行,否则代理将会失效 # 可以有多个,注意多个不能换行,否则代理将会失效
VITE_PROXY = [["/dev-api","http://localhost:48080/admin-api"],["/upload","http://localhost:48080/admin-api/infra/file/upload"]] VITE_PROXY = [["/dev-api","http://localhost:8091/admin-api"],["/upload","http://localhost:8091/admin-api/infra/file/upload"]]
# VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]] # VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]]
# 是否删除Console.log # 是否删除Console.log
VITE_DROP_CONSOLE = false VITE_DROP_CONSOLE = falseY
# 基础页面地址,例如 swagger 等页面 # 基础页面地址,例如 swagger 等页面
VITE_GLOB_BASE_URL = "http://localhost:48080" VITE_GLOB_BASE_URL = "http://localhost:8091"
# 接口地址,如果没有跨域问题,直接在这里配置即可 # 接口地址,如果没有跨域问题,直接在这里配置即可
VITE_GLOB_API_URL = /dev-api VITE_GLOB_API_URL = /dev-api

@ -2,17 +2,10 @@
"name": "yudao-ui-admin-vben", "name": "yudao-ui-admin-vben",
"version": "1.8.1-snapshot", "version": "1.8.1-snapshot",
"packageManager": "pnpm@8.6.0", "packageManager": "pnpm@8.6.0",
"author": { "author": "yarn start/yarn serve",
"name": "xingyuv", "license": "yarn start/yarn serve",
"email": "xingyu4j@vip.qq.com",
"url": "https://gitee.com/xingyuv"
},
"license": "MIT",
"homepage": "https://gitee.com/xingyuv", "homepage": "https://gitee.com/xingyuv",
"repository": { "repository": "yarn start/yarn serve",
"type": "git",
"url": "git+https://gitee.com/xingyuv/vue-vben-admin.git"
},
"bugs": { "bugs": {
"url": "https://gitee.com/xingyuv/issues" "url": "https://gitee.com/xingyuv/issues"
}, },
@ -165,5 +158,8 @@
"commitizen": { "commitizen": {
"path": "node_modules/cz-git" "path": "node_modules/cz-git"
} }
} },
"description": "yarn start/yarn serve",
"main": "yarn start/yarn serve",
"private": null
} }

@ -0,0 +1,71 @@
<script lang="ts" setup>
import { computed } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { BasicForm, useForm } from '@/components/Form'
import { BasicModal, useModalInner } from '@/components/Modal'
import { useUserStore } from '@/store/modules/user'
import { useLockStore } from '@/store/modules/lock'
import headerImg from '@/assets/images/header.jpg'
defineOptions({ name: 'LockModal' })
const { t } = useI18n()
const userStore = useUserStore()
const lockStore = useLockStore()
const getRealName = computed(() => userStore.getUserInfo?.user.nickname)
const [register, { closeModal }] = useModalInner()
const [registerForm, { validateFields, resetFields }] = useForm({
showActionButtonGroup: false,
schemas: [
{
field: 'password',
label: t('layout.header.lockScreenPassword'),
colProps: {
span: 24,
},
component: 'InputPassword',
required: true,
},
],
})
async function handleLock() {
const values = (await validateFields()) as any
const password: string | undefined = values.password
closeModal()
lockStore.setLockInfo({
isLock: true,
pwd: password,
})
await resetFields()
}
const avatar = computed(() => {
const { avatar } = userStore.getUserInfo.user
return avatar || headerImg
})
</script>
<template>
<BasicModal :footer="null" width="25%" :title="t('layout.header.lockScreen')" v-bind="$attrs" @register="register">
<div class="relative rounded-10 px-8 pb-8 pt-30">
<div class="absolute left-[calc(50%-45px)] top-0 w-auto text-center">
<img :src="avatar" class="w-18 rounded-50%">
<p class="mt-2">
{{ getRealName }}
</p>
</div>
<BasicForm @register="registerForm" />
<div class="mt-4 text-center">
<a-button type="primary" block class="mt-2" @click="handleLock">
{{ t('layout.header.lockScreenBtn') }}
</a-button>
</div>
</div>
</BasicModal>
</template>

@ -0,0 +1,156 @@
<script lang="ts" setup>
import { Avatar, Dropdown, Menu, MenuDivider } from 'ant-design-vue'
import { UserOutlined } from '@ant-design/icons-vue'
import type { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'
import { computed } from 'vue'
import { DOC_URL } from '@/settings/siteSetting'
import { useUserStore } from '@/store/modules/user'
import { useHeaderSetting } from '@/hooks/setting/useHeaderSetting'
import { useI18n } from '@/hooks/web/useI18n'
import { useDesign } from '@/hooks/web/useDesign'
import { useModal } from '@/components/Modal'
import headerImg from '@/assets/images/header.jpg'
import { propTypes } from '@/utils/propTypes'
import { openWindow } from '@/utils'
import { useGo } from '@/hooks/web/usePage'
import { createAsyncComponent } from '@/utils/factory/createAsyncComponent'
defineOptions({ name: 'UserDropdown' })
defineProps({
theme: propTypes.oneOf(['dark', 'light']),
})
const go = useGo()
type MenuEvent = 'profile' | 'logout' | 'doc' | 'lock'
const MenuItem = createAsyncComponent(() => import('./DropMenuItem.vue'))
const LockAction = createAsyncComponent(() => import('../lock/LockModal.vue'))
const { prefixCls } = useDesign('header-user-dropdown')
const { t } = useI18n()
const { getShowDoc, getUseLockPage } = useHeaderSetting()
const userStore = useUserStore()
const getUserInfo = computed(() => {
const { nickname = '', avatar } = userStore.getUserInfo.user || {}
return { nickname, avatar: avatar || headerImg }
})
const [register, { openModal }] = useModal()
function handleLock() {
openModal(true)
}
// login out
function handleLoginOut() {
userStore.confirmLoginOut()
}
// open doc
function openDoc() {
openWindow(DOC_URL)
}
function openProfile() {
go('/profile/index')
}
function handleMenuClick(e: MenuInfo) {
switch (e.key as MenuEvent) {
case 'profile':
openProfile()
break
case 'logout':
handleLoginOut()
break
case 'doc':
openDoc()
break
case 'lock':
handleLock()
break
}
}
</script>
<template>
<Dropdown placement="bottomLeft" :overlay-class-name="`${prefixCls}-dropdown-overlay`">
<span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
<Avatar size="small" :class="`${prefixCls}__avatar`" :src="getUserInfo.avatar">
<template #icon>
<UserOutlined />
</template>
</Avatar>
<span :class="`${prefixCls}__info hidden md:block`">
<span :class="`${prefixCls}__name`" class="truncate">
{{ getUserInfo.nickname }}
</span>
</span>
</span>
<template #overlay>
<Menu @click="handleMenuClick">
<MenuItem key="profile" :text="t('layout.header.accountCenter')" icon="ion:person-outline" />
<MenuItem
v-if="getShowDoc" key="doc" :text="t('layout.header.dropdownItemDoc')"
icon="ion:document-text-outline"
/>
<MenuDivider v-if="getShowDoc" />
<MenuItem
v-if="getUseLockPage" key="lock" :text="t('layout.header.tooltipLock')"
icon="ion:lock-closed-outline"
/>
<MenuItem key="logout" :text="t('layout.header.dropdownItemLoginOut')" icon="ion:power-outline" />
</Menu>
</template>
</Dropdown>
<LockAction @register="register" />
</template>
<style lang="less">
@prefix-cls: ~'@{namespace}-header-user-dropdown';
.@{prefix-cls} {
align-items: center;
height: @header-height;
padding: 0 0 0 10px;
padding-right: 10px;
overflow: hidden;
font-size: 12px;
cursor: pointer;
&__avatar {
margin-right: 5px;
border-radius: 50%;
}
&__name {
font-size: 14px;
}
&--dark {
&:hover {
background-color: @header-dark-bg-hover-color;
}
}
&--light {
&:hover {
background-color: @header-light-bg-hover-color;
}
.@{prefix-cls}__desc {
color: @header-light-desc-color;
}
}
&-dropdown-overlay {
.ant-dropdown-menu-item {
min-width: 160px;
}
}
}
</style>

@ -0,0 +1,46 @@
<script lang="ts" setup>
import { columns, searchFormSchema } from './loginLog.data'
import { useI18n } from '@/hooks/web/useI18n'
import { useMessage } from '@/hooks/web/useMessage'
import { BasicTable, useTable } from '@/components/Table'
import type { LoginLogReqVO } from '@/api/system/loginLog'
import { exportLoginLog, getLoginLogPage } from '@/api/system/loginLog'
defineOptions({ name: 'SystemLoginLog' })
const { t } = useI18n()
const { createConfirm, createMessage } = useMessage()
const [registerTable, { getForm }] = useTable({
title: '登录日志列表',
api: getLoginLogPage,
columns,
formConfig: { labelWidth: 120, schemas: searchFormSchema },
useSearchForm: true,
showTableSetting: true,
showIndexColumn: false,
})
async function handleExport() {
createConfirm({
title: t('common.exportTitle'),
iconType: 'warning',
content: t('common.exportMessage'),
async onOk() {
await exportLoginLog(getForm().getFieldsValue() as LoginLogReqVO)
createMessage.success(t('common.exportSuccessText'))
},
})
}
</script>
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button v-auth="['system:login-log:export']" @click="handleExport">
{{ t('action.export') }}
</a-button>
</template>
</BasicTable>
</div>
</template>

@ -0,0 +1,80 @@
<script lang="ts" setup>
import NoticeModal from './NoticeModal.vue'
import { columns, searchFormSchema } from './notice.data'
import { useI18n } from '@/hooks/web/useI18n'
import { useMessage } from '@/hooks/web/useMessage'
import { useModal } from '@/components/Modal'
import { IconEnum } from '@/enums/appEnum'
import { BasicTable, TableAction, useTable } from '@/components/Table'
import { deleteNotice, getNoticePage } from '@/api/system/notice'
defineOptions({ name: 'SystemNotice' })
const { t } = useI18n()
const { createMessage } = useMessage()
const [registerModal, { openModal }] = useModal()
const [registerTable, { reload }] = useTable({
title: '公告列表',
api: getNoticePage,
columns,
formConfig: { labelWidth: 120, schemas: searchFormSchema },
useSearchForm: true,
showTableSetting: true,
showIndexColumn: false,
actionColumn: {
width: 200,
title: t('common.action'),
dataIndex: 'action',
fixed: 'right',
},
})
function handleCreate() {
openModal(true, { isUpdate: false })
}
function handleEdit(record: Recordable) {
openModal(true, { record, isUpdate: true })
}
async function handleDelete(record: Recordable) {
await deleteNotice(record.id)
createMessage.success(t('common.delSuccessText'))
reload()
}
</script>
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button v-auth="['system:notice:create']" type="primary" :pre-icon="IconEnum.ADD" @click="handleCreate">
{{ t('action.create') }}
</a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{ icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:notice:update', onClick: handleEdit.bind(null, record) },
{
icon: IconEnum.DELETE,
danger: true,
label: t('action.delete'),
auth: 'system:notice:delete',
popConfirm: {
title: t('common.delMessage'),
placement: 'left',
confirm: handleDelete.bind(null, record),
},
},
{ icon: IconEnum.EDIT, label: t('action.detail'), auth: 'system:notice:Detail', onClick: handleEdit.bind(null, record) },
]"
/>
</template>
</template>
</BasicTable>
<NoticeModal @register="registerModal" @success="reload()" />
</div>
</template>

@ -0,0 +1,56 @@
<script lang="ts" setup>
import { columns, searchFormSchema } from './message.data'
import { IconEnum } from '@/enums/appEnum'
import { useI18n } from '@/hooks/web/useI18n'
import { BasicTable, TableAction, useTable } from '@/components/Table'
import { getNotifyMessagePage } from '@/api/system/notify/message'
import MessageInfoModal from '@/views/system/notify/components/MessageInfoModal.vue'
import { useModal } from '@/components/Modal'
defineOptions({ name: 'SystemMessage' })
const { t } = useI18n()
const [registerTable] = useTable({
title: '站内信记录列表',
api: getNotifyMessagePage,
columns,
formConfig: { labelWidth: 120, schemas: searchFormSchema },
useSearchForm: true,
showTableSetting: true,
showIndexColumn: false,
actionColumn: {
width: 100,
title: t('common.action'),
fixed: 'right',
key: 'action',
},
})
const [registerModal, { openModal }] = useModal()
function handleShowInfo(record: Recordable) {
openModal(true, record)
}
</script>
<template>
<div>
<BasicTable @register="registerTable">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
label: t('action.detail'),
icon: IconEnum.LOG,
onClick: handleShowInfo.bind(null, record),
},
]"
/>
</template>
</template>
</BasicTable>
<MessageInfoModal @register="registerModal" />
</div>
</template>

@ -0,0 +1,142 @@
<script lang="ts" setup>
import { reactive } from 'vue'
import UserModal from './UserModal.vue'
import UserRoleModal from './UserRoleModal.vue'
import ResetPwdModal from './ResetPwdModal.vue'
import DeptTree from './DeptTree.vue'
import { columns, searchFormSchema } from './user.data'
import { useI18n } from '@/hooks/web/useI18n'
import { useMessage } from '@/hooks/web/useMessage'
import { useModal } from '@/components/Modal'
import { IconEnum } from '@/enums/appEnum'
import { BasicTable, TableAction, useTable } from '@/components/Table'
import type { UserExportReqVO } from '@/api/system/user'
import { deleteUser, exportUser, getUserPage } from '@/api/system/user'
defineOptions({ name: 'SystemUser' })
const { t } = useI18n()
const { createConfirm, createMessage } = useMessage()
const [registerModal, { openModal }] = useModal()
const [registerRoleModal, { openModal: openRoleModal }] = useModal()
const [registerPwdModal, { openModal: openPwdModal }] = useModal()
const searchInfo = reactive<Recordable>({})
const [registerTable, { getForm, reload }] = useTable({
title: '账号列表',
api: getUserPage,
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
},
useSearchForm: true,
showTableSetting: true,
showIndexColumn: false,
actionColumn: {
width: 140,
title: t('common.action'),
dataIndex: 'action',
fixed: 'right',
},
})
/** 新增按钮操作 */
function handleCreate() {
openModal(true, { isUpdate: false })
}
/** 导出按钮操作 */
async function handleExport() {
createConfirm({
title: t('common.exportTitle'),
iconType: 'warning',
content: t('common.exportMessage'),
async onOk() {
await exportUser(getForm().getFieldsValue() as UserExportReqVO)
createMessage.success(t('common.exportSuccessText'))
},
})
}
/** 修改按钮操作 */
function handleEdit(record: Recordable) {
openModal(true, { record, isUpdate: true })
}
/** 分配用户角色操作 */
function handleRole(record: Recordable) {
openRoleModal(true, { record })
}
/** 重置密码按钮操作 */
function handleResetPwd(record: Recordable) {
openPwdModal(true, { record })
}
/** 删除按钮操作 */
async function handleDelete(record: Recordable) {
await deleteUser(record.id)
createMessage.success(t('common.delSuccessText'))
reload()
}
/** 点击部门操作 */
function handleSelect(deptId = '') {
searchInfo.deptId = deptId
reload()
}
</script>
<template>
<div class="flex">
<DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
<BasicTable class="w-3/4 xl:w-4/5" :search-info="searchInfo" @register="registerTable">
<template #toolbar>
<a-button v-auth="['system:user:create']" type="primary" :pre-icon="IconEnum.ADD" @click="handleCreate">
{{ t('action.create') }}
</a-button>
<a-button v-auth="['system:user:export']" :pre-icon="IconEnum.EXPORT" @click="handleExport">
{{ t('action.export') }}
</a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{ icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:user:update', onClick: handleEdit.bind(null, record) },
]"
:drop-down-actions="[
{
icon: IconEnum.EDIT,
label: '分配角色',
auth: 'system:permission:assign-user-role',
onClick: handleRole.bind(null, record),
},
{
icon: IconEnum.EDIT,
label: '重置密码',
auth: 'system:user:update-password',
onClick: handleResetPwd.bind(null, record),
},
{
icon: IconEnum.DELETE,
danger: true,
label: t('action.delete'),
auth: 'system:user:delete',
popConfirm: {
title: t('common.delMessage'),
placement: 'left',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</template>
</template>
</BasicTable>
<UserModal @register="registerModal" @success="reload()" />
<UserRoleModal @register="registerRoleModal" @success="reload()" />
<ResetPwdModal @register="registerPwdModal" @success="reload()" />
</div>
</template>

File diff suppressed because it is too large Load Diff

@ -9,6 +9,7 @@ import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO;
import com.yunxi.scm.module.system.service.dept.DeptService; import com.yunxi.scm.module.system.service.dept.DeptService;
import com.yunxi.scm.module.system.service.user.AdminUserService; import com.yunxi.scm.module.system.service.user.AdminUserService;
import com.yunxi.scm.module.xxjj.controller.admin.task.vo.TaskCreateReqVO; import com.yunxi.scm.module.xxjj.controller.admin.task.vo.TaskCreateReqVO;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectUserDO;
import com.yunxi.scm.module.xxjj.service.task.TaskService; import com.yunxi.scm.module.xxjj.service.task.TaskService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -129,21 +130,26 @@ public class ProjectController {
@GetMapping("/pagequeryuser") @GetMapping("/pagequeryuser")
@Operation(summary = "获得成员列表") @Operation(summary = "获得成员列表")
@PreAuthorize("@ss.hasPermission('xxjj:project:pagequeryuser')") @PreAuthorize("@ss.hasPermission('xxjj:project:pagequeryuser')")
public CommonResult<PageResult<UserPageItemRespVO>> getProjectPageUser(@Valid UserPageReqVO userPageReqVO) { public CommonResult<List<ProjectUserDO>> getProjectUser() {
PageResult<AdminUserDO> pageResult = adminUserService.getUserPage(userPageReqVO); List list=projectService.queryProjectUserList();
System.out.println(list);
Collection<Long> deptIds = convertList(pageResult.getList(), AdminUserDO::getDeptId); return success(list);
Map<Long, DeptDO> deptMap = deptService.getDeptMap(deptIds);
// 拼接结果返回
List<UserPageItemRespVO> userList = new ArrayList<>(pageResult.getList().size());
pageResult.getList().forEach(user -> {
UserPageItemRespVO respVO = UserConvert.INSTANCE.convert(user);
respVO.setDept(UserConvert.INSTANCE.convert(deptMap.get(user.getDeptId())));
userList.add(respVO);
});
return success(new PageResult<>(userList, pageResult.getTotal()));
} }
// public CommonResult<PageResult<UserPageItemRespVO>> getProjectPageUser(@Valid UserPageReqVO userPageReqVO) {
// PageResult<AdminUserDO> pageResult = adminUserService.getUserPage(userPageReqVO);
//
// Collection<Long> deptIds = convertList(pageResult.getList(), AdminUserDO::getDeptId);
// Map<Long, DeptDO> deptMap = deptService.getDeptMap(deptIds);
// // 拼接结果返回
// List<UserPageItemRespVO> userList = new ArrayList<>(pageResult.getList().size());
// pageResult.getList().forEach(user -> {
// UserPageItemRespVO respVO = UserConvert.INSTANCE.convert(user);
// respVO.setDept(UserConvert.INSTANCE.convert(deptMap.get(user.getDeptId())));
// userList.add(respVO);
// });
//
// return success(new PageResult<>(userList, pageResult.getTotal()));
// }
} }

@ -0,0 +1,104 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.project;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
import com.yunxi.scm.framework.mybatis.core.type.JsonLongSetTypeHandler;
import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
import com.yunxi.scm.module.system.enums.common.SexEnum;
import lombok.*;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import java.time.LocalDateTime;
import java.util.Set;
/**
* DO
*
* @author
*/
@TableName(value = "system_users", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字,所以使用 system_users
@KeySequence("system_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ProjectUserDO extends TenantBaseDO {
/**
* ID
*/
@TableId
private Long id;
/**
*
*/
private String username;
/**
*
*
* 使 {@link BCryptPasswordEncoder} salt
*/
private String password;
/**
*
*/
private String nickname;
/**
*
*/
private String remark;
/**
* ID
*/
private Long deptId;
/**
*
*/
@TableField(typeHandler = JsonLongSetTypeHandler.class)
private Set<Long> postIds;
/**
*
*/
private String email;
/**
*
*/
private String mobile;
/**
*
*
* {@link SexEnum}
*/
private Integer sex;
/**
*
*/
private String avatar;
/**
*
*
* {@link CommonStatusEnum}
*/
private Integer status;
/**
* IP
*/
private String loginIp;
/**
*
*/
private LocalDateTime loginDate;
@TableField(exist = false)
private String roleId;
@TableField(exist = false)
private LocalDateTime createTime;
@TableField(exist = false)
private String deptname;
@TableField(exist = false)
private String rolename;
}

@ -6,6 +6,7 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectDO; import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectDO;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectUserDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.project.vo.*; import com.yunxi.scm.module.xxjj.controller.admin.project.vo.*;
@ -55,4 +56,5 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
.orderByDesc(ProjectDO::getId)); .orderByDesc(ProjectDO::getId));
} }
List<ProjectUserDO> queryProjectUser();
} }

@ -5,6 +5,7 @@ import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.project.vo.*; import com.yunxi.scm.module.xxjj.controller.admin.project.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectDO; import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectDO;
import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectUserDO;
/** /**
* Service * Service
@ -67,4 +68,5 @@ public interface ProjectService {
*/ */
List<ProjectDO> getProjectList(ProjectExportReqVO exportReqVO); List<ProjectDO> getProjectList(ProjectExportReqVO exportReqVO);
List<ProjectUserDO> queryProjectUserList();
} }

@ -1,5 +1,6 @@
package com.yunxi.scm.module.xxjj.service.project; package com.yunxi.scm.module.xxjj.service.project;
import com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectUserDO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -79,4 +80,9 @@ public class ProjectServiceImpl implements ProjectService {
return projectMapper.selectList(exportReqVO); return projectMapper.selectList(exportReqVO);
} }
@Override
public List<ProjectUserDO> queryProjectUserList() {
return projectMapper.queryProjectUser();
}
} }

@ -9,4 +9,22 @@
文档可见https://www.iocoder.cn/MyBatis/x-plugins/ 文档可见https://www.iocoder.cn/MyBatis/x-plugins/
--> -->
<select id="queryProjectUser" resultType="com.yunxi.scm.module.xxjj.dal.dataobject.project.ProjectUserDO">
SELECT
user_id,
dept_id,
role_id,
username,
a.create_time,
c.name AS deptname,
d.name AS rolename
FROM
system_users a
LEFT JOIN system_user_role b ON a.id=b.user_id
LEFT JOIN system_dept c ON a.dept_id=c.id
LEFT JOIN system_role d ON b.role_id=d.id
WHERE 1=1
AND a.deleted='0'
</select>
</mapper> </mapper>

@ -0,0 +1,134 @@
<template>
<div class="app-container">
<doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="登录地址" prop="userIp">
<el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable style="width: 240px;"
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="用户名称" prop="username">
<el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px;"
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="结果" clearable style="width: 240px">
<el-option :key="true" label="成功" :value="true"/>
<el-option :key="false" label="失败" :value="false"/>
</el-select>
</el-form-item>
<el-form-item label="登录时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['system:login-log:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="list">
<el-table-column label="访问编号" align="center" prop="id" />
<el-table-column label="日志类型" align="center" prop="logType" width="120">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="scope.row.logType" />
</template>
</el-table-column>
<el-table-column label="用户名称" align="center" prop="username" />
<el-table-column label="登录地址" align="center" prop="userIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="userAgent" align="center" prop="userAgent" width="400" :show-overflow-tooltip="true" />
<el-table-column label="结果" align="center" prop="status">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_RESULT" :value="scope.row.result" />
</template>
</el-table-column>
<el-table-column label="登录日期" align="center" prop="loginTime" width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
</div>
</template>
<script>
import { list, exportLoginLog } from "@/api/system/loginlog";
export default {
name: "SystemLoginLog",
data() {
return {
//
loading: true,
//
exportLoading: false,
//
showSearch: true,
//
total: 0,
//
list: [],
//
queryParams: {
pageNo: 1,
pageSize: 10,
userIp: undefined,
username: undefined,
status: undefined,
createTime: []
}
};
},
created() {
this.getList();
},
methods: {
/** 查询登录日志列表 */
getList() {
this.loading = true;
list(this.queryParams).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
//
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.exportLoading = true;
return exportLoginLog(params);
}).then(response => {
this.$download.excel(response, '登录日志.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>

@ -48,6 +48,10 @@
v-hasPermi="['system:notice:update']">修改</el-button> v-hasPermi="['system:notice:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:notice:delete']">删除</el-button> v-hasPermi="['system:notice:delete']">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
v-hasPermi="['system:notice:Detail']">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -99,6 +103,46 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 详情-->
<el-dialog :title="title1" :visible.sync="open1" width="780px" append-to-body>
<el-form ref="form" :model="form"label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="公告标题" prop="title" >
<el-input v-model="form.title" placeholder="请输入公告标题" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公告类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" :disabled="true">
<el-option
v-for="dict in noticeTypeDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="内容">
<el-input v-model="form.content" placeholder="请输入公告标题" :disabled="true" />
<!-- <editor v-model="form.content" :min-height="250"/>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<el-button @click="cancel1"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -126,13 +170,16 @@ export default {
noticeList: [], noticeList: [],
// //
title: "", title: "",
title1: "",
// //
open: false, open: false,
open1: false,
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
title: undefined, title: undefined,
title1: undefined,
status: undefined status: undefined
}, },
// //
@ -172,11 +219,17 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
//
cancel1() {
this.open1= false;
this.reset();
},
// //
reset() { reset() {
this.form = { this.form = {
id: undefined, id: undefined,
title: undefined, title: undefined,
title1:undefined,
type: undefined, type: undefined,
content: undefined, content: undefined,
status: CommonStatusEnum.ENABLE status: CommonStatusEnum.ENABLE
@ -209,6 +262,16 @@ export default {
this.title = "修改公告"; this.title = "修改公告";
}); });
}, },
handleDetail(row) {
this.reset();
const id = row.id || this.ids
getNotice(id).then(response => {
this.form = response.data;
this.open1 = true;
this.title1 = "详情公告";
});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {

@ -0,0 +1,179 @@
<template>
<div class="app-container">
<doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户编号" prop="userId">
<el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="用户类型" prop="userType">
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="模板编码" prop="templateCode">
<el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="模版类型" prop="templateType">
<el-select v-model="queryParams.templateType" placeholder="请选择模版类型" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
: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" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="用户编号" align="center" prop="userId" />
<el-table-column label="用户类型" align="center" prop="userType">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
</template>
</el-table-column>
<el-table-column label="模板编码" align="center" prop="templateCode" />
<el-table-column label="发送人名称" align="center" prop="templateNickname" />
<el-table-column label="模版内容" align="center" prop="templateContent" />
<el-table-column label="模版类型" align="center" prop="templateType">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
</template>
</el-table-column>
<el-table-column label="是否已读" align="center" prop="readStatus">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
</template>
</el-table-column>
<el-table-column label="阅读时间" align="center" prop="readTime" width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.readTime) }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
v-hasPermi="['system:notify-message:query']">详细</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 站内信详细-->
<el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
<el-form ref="form" :model="form" label-width="160px">
<el-row>
<el-col :span="24">
<el-form-item label="日志主键:">{{ form.id }}</el-form-item>
<el-form-item label="发送时间:">{{ parseTime(form.createTime) }}</el-form-item>
<el-form-item label="用户编号:">{{ form.userId }}</el-form-item>
<el-form-item label="用户类型:">
<dict-tag :type="DICT_TYPE.USER_TYPE" :value="form.userType"/>
</el-form-item>
<el-form-item label="模板编号:">{{ form.templateId }}</el-form-item>
<el-form-item label="模板编码:">{{ form.templateCode }}</el-form-item>
<el-form-item label="模板类型:">
<dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="form.templateType" />
</el-form-item>
<el-form-item label="模版发送人名称:">{{ form.templateNickname }}</el-form-item>
<el-form-item label="邮件内容:">{{ form.templateContent }}</el-form-item>
<el-form-item label="模版参数:">{{ form.templateParams }}</el-form-item>
<el-form-item label="是否已读:">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="form.readStatus" />
</el-form-item>
<el-form-item label="阅读时间:">{{ parseTime(form.readTime) }}</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getNotifyMessagePage } from "@/api/system/notify/message";
export default {
name: "SystemNotifyMessage",
data() {
return {
//
loading: true,
//
showSearch: true,
//
total: 0,
//
list: [],
//
title: "站内信详细",
//
open: false,
//
queryParams: {
pageNo: 1,
pageSize: 10,
userId: null,
userType: null,
templateCode: null,
templateType: null,
createTime: [],
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
//
getNotifyMessagePage(this.queryParams).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 详细按钮操作 */
handleView(row) {
this.open = true;
this.form = row;
}
}
};
</script>

@ -0,0 +1,100 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>个人信息</span>
</div>
<div>
<div class="text-center">
<userAvatar :user="user" />
</div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ user.username }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ user.mobile }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.name }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属岗位
<div class="pull-right" v-if="user.posts">{{ user.posts.map(post => post.name).join(',') }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right" v-if="user.roles">{{ user.roles.map(role => role.name).join(',') }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ parseTime(user.createTime) }}</div>
</li>
</ul>
</div>
</el-card>
</el-col>
<el-col :span="18" :xs="24">
<el-card>
<div slot="header" class="clearfix">
<span>基本资料</span>
</div>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="user" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd :user="user" />
</el-tab-pane>
<el-tab-pane label="社交信息" name="userSocial">
<userSocial :user="user" :getUser="getUser" :setActiveTab="setActiveTab" />
</el-tab-pane>
</el-tabs>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
import userSocial from "./userSocial";
import { getUserProfile } from "@/api/system/user";
export default {
name: "Profile",
components: { userAvatar, userInfo, resetPwd, userSocial },
data() {
return {
user: {},
roleGroup: {},
postGroup: {},
activeTab: "userinfo"
};
},
created() {
this.getUser();
},
methods: {
getUser() {
getUserProfile().then(response => {
this.user = response.data;
});
},
setActiveTab(activeTab) {
this.activeTab = activeTab
}
}
};
</script>
Loading…
Cancel
Save