Skip to content

Commit 3d2d48b

Browse files
committed
🐛 修复 user 在 IDEA 报错的问题
1 parent fa421d0 commit 3d2d48b

File tree

6 files changed

+29
-40
lines changed

6 files changed

+29
-40
lines changed

src/api/system/user/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ export const updateUserStatus = (id: number, status: number) => {
7777

7878
// 获取用户精简信息列表
7979
export const getSimpleUserList = (): Promise<UserVO[]> => {
80-
return request.get({ url: '/system/user/list-all-simple' })
80+
return request.get({ url: '/system/user/simple-list' })
8181
}

src/api/system/user/profile.ts

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,25 @@
11
import request from '@/config/axios'
22

3-
export interface ProfileDept {
4-
id: number
5-
name: string
6-
}
7-
export interface ProfileRole {
8-
id: number
9-
name: string
10-
}
11-
export interface ProfilePost {
12-
id: number
13-
name: string
14-
}
15-
export interface SocialUser {
16-
id: number
17-
type: number
18-
openid: string
19-
token: string
20-
rawTokenInfo: string
21-
nickname: string
22-
avatar: string
23-
rawUserInfo: string
24-
code: string
25-
state: string
26-
}
273
export interface ProfileVO {
284
id: number
295
username: string
306
nickname: string
31-
dept: ProfileDept
32-
roles: ProfileRole[]
33-
posts: ProfilePost[]
34-
socialUsers: SocialUser[]
7+
dept: {
8+
id: number
9+
name: string
10+
}
11+
roles: {
12+
id: number
13+
name: string
14+
}[]
15+
posts: {
16+
id: number
17+
name: string
18+
}[]
19+
socialUsers: {
20+
type: number
21+
openid: string
22+
}[]
3523
email: string
3624
mobile: string
3725
sex: number

src/views/Profile/components/ProfileUser.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<li class="list-group-item">
4242
<Icon class="mr-5px" icon="ep:calendar" />
4343
{{ t('profile.user.createTime') }}
44-
<div class="pull-right">{{ formatDate(userInfo?.createTime) }}</div>
44+
<div class="pull-right">{{ formatDate(userInfo.createTime) }}</div>
4545
</li>
4646
</ul>
4747
</div>
@@ -55,7 +55,7 @@ import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
5555
defineOptions({ name: 'ProfileUser' })
5656
5757
const { t } = useI18n()
58-
const userInfo = ref<ProfileVO>()
58+
const userInfo = ref({} as ProfileVO)
5959
const getUserInfo = async () => {
6060
const users = await getUserProfile()
6161
userInfo.value = users

src/views/system/user/UserAssignRoleForm.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ const message = useMessage() // 消息弹窗
3232
const dialogVisible = ref(false) // 弹窗的是否展示
3333
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
3434
const formData = ref({
35-
id: undefined,
35+
id: -1,
3636
nickname: '',
3737
username: '',
3838
roleIds: []
3939
})
4040
const formRef = ref() // 表单 Ref
41-
const roleList = ref([]) // 角色的列表
41+
const roleList = ref([] as RoleApi.RoleVO[]) // 角色的列表
4242
4343
/** 打开弹窗 */
4444
const open = async (row: UserApi.UserVO) => {
@@ -86,7 +86,7 @@ const submitForm = async () => {
8686
/** 重置表单 */
8787
const resetForm = () => {
8888
formData.value = {
89-
id: undefined,
89+
id: -1,
9090
nickname: '',
9191
username: '',
9292
roleIds: []

src/views/system/user/UserForm.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<el-select v-model="formData.sex" placeholder="请选择">
6262
<el-option
6363
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
64-
:key="dict.value"
64+
:key="dict.value as number"
6565
:label="dict.label"
6666
:value="dict.value"
6767
/>
@@ -75,7 +75,7 @@
7575
v-for="item in postList"
7676
:key="item.id"
7777
:label="item.name"
78-
:value="item.id"
78+
:value="item.id!"
7979
/>
8080
</el-select>
8181
</el-form-item>
@@ -102,6 +102,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
102102
import * as PostApi from '@/api/system/post'
103103
import * as DeptApi from '@/api/system/dept'
104104
import * as UserApi from '@/api/system/user'
105+
import { FormRules } from 'element-plus'
105106
106107
defineOptions({ name: 'SystemUserForm' })
107108
@@ -126,7 +127,7 @@ const formData = ref({
126127
status: CommonStatusEnum.ENABLE,
127128
roleIds: []
128129
})
129-
const formRules = reactive({
130+
const formRules = reactive<FormRules>({
130131
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
131132
nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
132133
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
@@ -147,7 +148,7 @@ const formRules = reactive({
147148
})
148149
const formRef = ref() // 表单 Ref
149150
const deptList = ref<Tree[]>([]) // 树形结构
150-
const postList = ref([]) // 岗位列表
151+
const postList = ref([] as PostApi.PostVO[]) // 岗位列表
151152
152153
/** 打开弹窗 */
153154
const open = async (type: string, id?: number) => {

src/views/system/user/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
>
4848
<el-option
4949
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
50-
:key="dict.value"
50+
:key="dict.value as number"
5151
:label="dict.label"
5252
:value="dict.value"
5353
/>
@@ -113,7 +113,7 @@
113113
label="部门"
114114
align="center"
115115
key="deptName"
116-
prop="dept.name"
116+
prop="deptName"
117117
:show-overflow-tooltip="true"
118118
/>
119119
<el-table-column label="手机号码" align="center" prop="mobile" width="120" />

0 commit comments

Comments
 (0)