From 1f80e197195273528f2086901b97350e1b8f5f23 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Tue, 14 Dec 2021 22:39:31 +0800 Subject: [PATCH 01/62] =?UTF-8?q?1.=E7=99=BB=E9=99=86api=202.=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=93=8D=E5=BA=94=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?= =?UTF-8?q?=203.=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/console/customer/index.ts | 12 +++++++++ src/utils/yqhp/request.ts | 42 +++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/api/console/customer/index.ts create mode 100644 src/utils/yqhp/request.ts diff --git a/.env.development b/.env.development index 058274c..ca43837 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ ENV = 'development' # 本地环境接口地址 -VITE_API_URL = 'http://localhost:8888/' \ No newline at end of file +VITE_API_URL = 'http://localhost:18888/' \ No newline at end of file diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts new file mode 100644 index 0000000..4ecc809 --- /dev/null +++ b/src/api/console/customer/index.ts @@ -0,0 +1,12 @@ +import request from '/@/utils/yqhp/request'; + +export function auth(form: object) { + const formData = new FormData(); + formData.append('username', form.username); + formData.append('password', form.password); + return request({ + url: '/console/customer/auth', + method: 'post', + data: formData + }); +} diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts new file mode 100644 index 0000000..abd56fd --- /dev/null +++ b/src/utils/yqhp/request.ts @@ -0,0 +1,42 @@ +import axios from 'axios'; +import {ElMessage} from 'element-plus'; +import {Session} from '/@/utils/storage'; + +const service = axios.create({ + baseURL: import.meta.env.VITE_API_URL as any, + timeout: 120000, +}); + +service.interceptors.request.use( + (config) => { + const token = Session.get('token'); + if (token) { + config.headers.common['Authorization'] = `Bearer ${token}`; + } + return config; + }, + (error) => { + return Promise.reject(error); + } +); + +service.interceptors.response.use( + (response) => { + return response; + }, + (error) => { + const response = error.response; + if (response && response.data) { + if (response.data.code === 401) { + Session.clear(); + window.location.href = '/'; // 去登录页 + } + ElMessage.error(response.data.msg || response.data.error_description || 'error'); + } else { + ElMessage.error(error.message); + } + return Promise.reject(error); + } +); + +export default service; -- Gitee From b9d39949c97af44c427832edc95547681310a6c8 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Tue, 14 Dec 2021 22:43:21 +0800 Subject: [PATCH 02/62] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/yqhp/request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts index abd56fd..eab808e 100644 --- a/src/utils/yqhp/request.ts +++ b/src/utils/yqhp/request.ts @@ -31,7 +31,7 @@ service.interceptors.response.use( Session.clear(); window.location.href = '/'; // 去登录页 } - ElMessage.error(response.data.msg || response.data.error_description || 'error'); + ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error'); } else { ElMessage.error(error.message); } -- Gitee From 5434025fec58e3b746f80944ec82a26c27da20c1 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Tue, 14 Dec 2021 22:54:43 +0800 Subject: [PATCH 03/62] style --- src/api/console/customer/index.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts index 4ecc809..97771c3 100644 --- a/src/api/console/customer/index.ts +++ b/src/api/console/customer/index.ts @@ -1,12 +1,12 @@ import request from '/@/utils/yqhp/request'; export function auth(form: object) { - const formData = new FormData(); - formData.append('username', form.username); - formData.append('password', form.password); - return request({ - url: '/console/customer/auth', - method: 'post', - data: formData - }); + const formData = new FormData(); + formData.append('username', form.username); + formData.append('password', form.password); + return request({ + url: '/console/customer/auth', + method: 'post', + data: formData + }); } -- Gitee From c09616a2f080718ce3fafdf5a11295b9b692d82c Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Wed, 15 Dec 2021 09:56:46 +0800 Subject: [PATCH 04/62] style --- src/api/console/customer/index.ts | 16 ++++----- src/utils/yqhp/request.ts | 60 +++++++++++++++---------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts index 97771c3..4ecc809 100644 --- a/src/api/console/customer/index.ts +++ b/src/api/console/customer/index.ts @@ -1,12 +1,12 @@ import request from '/@/utils/yqhp/request'; export function auth(form: object) { - const formData = new FormData(); - formData.append('username', form.username); - formData.append('password', form.password); - return request({ - url: '/console/customer/auth', - method: 'post', - data: formData - }); + const formData = new FormData(); + formData.append('username', form.username); + formData.append('password', form.password); + return request({ + url: '/console/customer/auth', + method: 'post', + data: formData + }); } diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts index eab808e..3028034 100644 --- a/src/utils/yqhp/request.ts +++ b/src/utils/yqhp/request.ts @@ -1,42 +1,42 @@ import axios from 'axios'; -import {ElMessage} from 'element-plus'; -import {Session} from '/@/utils/storage'; +import { ElMessage } from 'element-plus'; +import { Session } from '/@/utils/storage'; const service = axios.create({ - baseURL: import.meta.env.VITE_API_URL as any, - timeout: 120000, + baseURL: import.meta.env.VITE_API_URL as any, + timeout: 120000 }); service.interceptors.request.use( - (config) => { - const token = Session.get('token'); - if (token) { - config.headers.common['Authorization'] = `Bearer ${token}`; - } - return config; - }, - (error) => { - return Promise.reject(error); - } + (config) => { + const token = Session.get('token'); + if (token) { + config.headers.common['Authorization'] = `Bearer ${token}`; + } + return config; + }, + (error) => { + return Promise.reject(error); + } ); service.interceptors.response.use( - (response) => { - return response; - }, - (error) => { - const response = error.response; - if (response && response.data) { - if (response.data.code === 401) { - Session.clear(); - window.location.href = '/'; // 去登录页 - } - ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error'); - } else { - ElMessage.error(error.message); - } - return Promise.reject(error); - } + (response) => { + return response; + }, + (error) => { + const response = error.response; + if (response && response.data) { + if (response.data.code === 401) { + Session.clear(); + window.location.href = '/'; // 去登录页 + } + ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error'); + } else { + ElMessage.error(error.message); + } + return Promise.reject(error); + } ); export default service; -- Gitee From 30db6e8c1260e4aa4c44985f09c5c8641517f74f Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Wed, 15 Dec 2021 11:33:30 +0800 Subject: [PATCH 05/62] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/yqhp/request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts index 3028034..86edf75 100644 --- a/src/utils/yqhp/request.ts +++ b/src/utils/yqhp/request.ts @@ -22,7 +22,7 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { - return response; + return response.data; }, (error) => { const response = error.response; -- Gitee From 0d668991dcdc1c7a2b40a3705218caefadb0c538 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Wed, 15 Dec 2021 12:45:26 +0800 Subject: [PATCH 06/62] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 2 +- src/api/console/customer/index.ts | 7 +++ src/router/route.ts | 2 +- src/views/yqhp/login/index.vue | 94 +++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 src/views/yqhp/login/index.vue diff --git a/.eslintrc.js b/.eslintrc.js index 7b28cb7..a7c88a5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -58,6 +58,6 @@ module.exports = { 'no-unused-vars': 'error', 'no-v-model-argument': 'off', 'no-case-declarations': 'off', - 'no-console': 'error', + // 'no-console': 'error', }, }; diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts index 4ecc809..fcaf390 100644 --- a/src/api/console/customer/index.ts +++ b/src/api/console/customer/index.ts @@ -10,3 +10,10 @@ export function auth(form: object) { data: formData }); } + +export function getUserInfo() { + return request({ + url: '/console/customer/info', + method: 'get' + }); +} diff --git a/src/router/route.ts b/src/router/route.ts index ccf3fec..84b4e47 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -1148,7 +1148,7 @@ export const staticRoutes: Array = [ { path: '/login', name: 'login', - component: () => import('/@/views/login/index.vue'), + component: () => import('/@/views/yqhp/login/index.vue'), meta: { title: '登录', }, diff --git a/src/views/yqhp/login/index.vue b/src/views/yqhp/login/index.vue new file mode 100644 index 0000000..d860c6d --- /dev/null +++ b/src/views/yqhp/login/index.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file -- Gitee From ad38ac2fba71dd51453d24a12bff1a0ecfd782c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=98=8E?= Date: Wed, 15 Dec 2021 18:25:23 +0800 Subject: [PATCH 07/62] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=202.=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=203?= =?UTF-8?q?.=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/user/index.ts | 37 +++++ src/router/route.ts | 2 +- .../yqhp/system/user/component/SaveUser.vue | 108 ++++++++++++++ src/views/yqhp/system/user/index.vue | 133 ++++++++++++++++++ 4 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 src/api/auth/user/index.ts create mode 100644 src/views/yqhp/system/user/component/SaveUser.vue create mode 100644 src/views/yqhp/system/user/index.vue diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts new file mode 100644 index 0000000..6c64ce2 --- /dev/null +++ b/src/api/auth/user/index.ts @@ -0,0 +1,37 @@ +import request from '/@/utils/yqhp/request'; + +/** + * 获取用户列表 + */ +export function getUserList(params: object) { + return request({ + url: '/auth/user/page', + method: 'get', + params, + }); +} + +/** + * 创建用户 + * @param params + */ +export function createUser(params: object) { + return request({ + url: '/auth/user', + method: 'post', + data: params, + }); +} + +/** + * 更新用户 + * @param userId + * @param data + */ +export function updateUser(userId: number, data: object) { + return request({ + url: `/auth/user/${userId}`, + method: 'put', + data + }) +} diff --git a/src/router/route.ts b/src/router/route.ts index 84b4e47..ae74248 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -94,7 +94,7 @@ export const dynamicRoutes: Array = [ { path: '/system/user', name: 'systemUser', - component: () => import('/@/views/system/user/index.vue'), + component: () => import('/@/views/yqhp/system/user/index.vue'), meta: { title: 'message.router.systemUser', isLink: '', diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue new file mode 100644 index 0000000..8c1ff1f --- /dev/null +++ b/src/views/yqhp/system/user/component/SaveUser.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue new file mode 100644 index 0000000..a96d9b9 --- /dev/null +++ b/src/views/yqhp/system/user/index.vue @@ -0,0 +1,133 @@ + + + + + -- Gitee From 1ad51dbe3968074d3b0794fcf613844086c02edd Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Wed, 15 Dec 2021 18:47:49 +0800 Subject: [PATCH 08/62] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/user/index.ts | 6 ++--- .../yqhp/system/user/component/SaveUser.vue | 25 ++++++++++++------- src/views/yqhp/system/user/index.vue | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts index 6c64ce2..fedd306 100644 --- a/src/api/auth/user/index.ts +++ b/src/api/auth/user/index.ts @@ -7,7 +7,7 @@ export function getUserList(params: object) { return request({ url: '/auth/user/page', method: 'get', - params, + params }); } @@ -19,7 +19,7 @@ export function createUser(params: object) { return request({ url: '/auth/user', method: 'post', - data: params, + data: params }); } @@ -33,5 +33,5 @@ export function updateUser(userId: number, data: object) { url: `/auth/user/${userId}`, method: 'put', data - }) + }); } diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue index 8c1ff1f..9cc0a11 100644 --- a/src/views/yqhp/system/user/component/SaveUser.vue +++ b/src/views/yqhp/system/user/component/SaveUser.vue @@ -25,7 +25,14 @@ - + @@ -50,7 +57,7 @@ export default { isShowDialog: false, isAdd: true, ruleForm: { - id: Number, + id: Number, username: '', // 帐号 nickname: '', // 昵称 email: '', // 邮箱 @@ -60,12 +67,12 @@ export default { }); // 打开弹窗 const openDialog = (row: Object) => { - if (row){ - state.ruleForm = {...row}; + if (row) { + state.ruleForm = { ...row }; state.isAdd = false; - }else { + } else { state.ruleForm = { - id: Number, + id: Number, username: '', // 帐号 nickname: '', // 昵称 email: '', // 邮箱 @@ -85,12 +92,12 @@ export default { closeDialog(); }; const onSubmit = async () => { - if (state.isAdd){ + if (state.isAdd) { //新增用户 await createUser(state.ruleForm); - }else { + } else { //修改用户 - await updateUser(state.ruleForm.id,state.ruleForm); + await updateUser(state.ruleForm.id, state.ruleForm); } //调用父组件方法,刷新用户列表页面 context.emit('initTableData'); diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue index a96d9b9..1c393e6 100644 --- a/src/views/yqhp/system/user/index.vue +++ b/src/views/yqhp/system/user/index.vue @@ -48,7 +48,7 @@ > - + -- Gitee From 42ee9d03ba165d3630495cca85b7674a41e396a3 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Thu, 16 Dec 2021 07:34:50 +0800 Subject: [PATCH 09/62] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yqhp/system/user/component/SaveUser.vue | 81 +++++++++++-------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue index 9cc0a11..3cdadf2 100644 --- a/src/views/yqhp/system/user/component/SaveUser.vue +++ b/src/views/yqhp/system/user/component/SaveUser.vue @@ -1,38 +1,34 @@ diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue index 1c393e6..9c2309f 100644 --- a/src/views/yqhp/system/user/index.vue +++ b/src/views/yqhp/system/user/index.vue @@ -2,8 +2,8 @@
+ + \ No newline at end of file diff --git a/src/views/yqhp/system/project/index.vue b/src/views/yqhp/system/project/index.vue new file mode 100644 index 0000000..4c7434b --- /dev/null +++ b/src/views/yqhp/system/project/index.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file -- Gitee From 6fe398ccaa922b6bf8c95c28b7ea33e1d7876a95 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Fri, 17 Dec 2021 11:56:41 +0800 Subject: [PATCH 12/62] style --- src/api/auth/user/index.ts | 2 +- .../yqhp/system/user/component/SaveUser.vue | 5 +- .../system/user/component/resetPassword.vue | 6 +- src/views/yqhp/system/user/index.vue | 86 ++++++++++--------- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts index a51d5ac..a92ddb5 100644 --- a/src/api/auth/user/index.ts +++ b/src/api/auth/user/index.ts @@ -44,7 +44,7 @@ export function deleteUser(userId: number) { return request({ url: `/auth/user/${userId}`, method: 'delete' - }) + }); } /** diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue index de22256..5c12297 100644 --- a/src/views/yqhp/system/user/component/SaveUser.vue +++ b/src/views/yqhp/system/user/component/SaveUser.vue @@ -68,7 +68,10 @@ export default { username: [{ required: true, message: '请输入用户名' }], password: [{ required: true, message: '请输入密码' }], nickname: [{ required: true, message: '请输入昵称' }], - email: [{ required: true, message: '请输入邮箱' },{type: 'email', message: '请输入正确的邮箱', trigger: ['blur']}], + email: [ + { required: true, message: '请输入邮箱' }, + { type: 'email', message: '请输入正确的邮箱', trigger: ['blur'] }, + ], status: [{ required: true, message: '请选择状态' }], }, }); diff --git a/src/views/yqhp/system/user/component/resetPassword.vue b/src/views/yqhp/system/user/component/resetPassword.vue index a14698e..c96f6c5 100644 --- a/src/views/yqhp/system/user/component/resetPassword.vue +++ b/src/views/yqhp/system/user/component/resetPassword.vue @@ -1,5 +1,5 @@ @@ -83,13 +87,15 @@ import { getUserList, deleteUser } from '/@/api/auth/user'; import SaveUser from './component/SaveUser.vue'; import ResetPassword from './component/ResetPassword.vue'; import UserRole from './component/UserRole.vue'; +import UserProject from './component/UserProject.vue'; export default { name: 'systemUser', - components: { SaveUser, ResetPassword, UserRole }, + components: { SaveUser, ResetPassword, UserRole, UserProject }, setup() { const saveUserRef = ref(); const resetPasswordRef = ref(); const userRoleRef = ref(); + const userProjectRef = ref(); const state: any = reactive({ queryParam: { status: '', @@ -134,9 +140,14 @@ export default { const onOpenResetPassword = (row: object) => { resetPasswordRef.value.openDialog(row.id); }; + //打开关联角色弹窗 const onOpenUserRole = (row: object) => { userRoleRef.value.openDialog(row.id); }; + //打开关联角色弹窗 + const onOpenUserProject = (row: object) => { + userProjectRef.value.openDialog(row.id); + }; // 分页改变 const onHandleSizeChange = (val: number) => { state.queryParam.pageSize = val; @@ -159,12 +170,14 @@ export default { saveUserRef, resetPasswordRef, userRoleRef, + userProjectRef, initTableData, onOpenAddUser, onOpenEditUser, onRowDel, onOpenResetPassword, onOpenUserRole, + onOpenUserProject, onHandleSizeChange, onHandleCurrentChange, onSearch, -- Gitee From aaf1daecbcde9d0bd2cb9b5a07e4b2a95b3c0a83 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Mon, 20 Dec 2021 12:56:12 +0800 Subject: [PATCH 23/62] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/component/UserProject.vue | 159 +++++++++--------- .../yqhp/system/user/component/UserRole.vue | 159 +++++++++--------- .../yqhp/system/user/component/userRole.vue | 90 ---------- 3 files changed, 154 insertions(+), 254 deletions(-) delete mode 100644 src/views/yqhp/system/user/component/userRole.vue diff --git a/src/views/yqhp/system/user/component/UserProject.vue b/src/views/yqhp/system/user/component/UserProject.vue index 3804758..8e1c1c4 100644 --- a/src/views/yqhp/system/user/component/UserProject.vue +++ b/src/views/yqhp/system/user/component/UserProject.vue @@ -1,90 +1,85 @@ diff --git a/src/views/yqhp/system/user/component/UserRole.vue b/src/views/yqhp/system/user/component/UserRole.vue index 87927b7..8d17032 100644 --- a/src/views/yqhp/system/user/component/UserRole.vue +++ b/src/views/yqhp/system/user/component/UserRole.vue @@ -1,90 +1,85 @@ diff --git a/src/views/yqhp/system/user/component/userRole.vue b/src/views/yqhp/system/user/component/userRole.vue deleted file mode 100644 index 87927b7..0000000 --- a/src/views/yqhp/system/user/component/userRole.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - -- Gitee From 6332d51c12c743bf8cf35d83053ca60c24f03887 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Mon, 20 Dec 2021 13:00:15 +0800 Subject: [PATCH 24/62] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/console/userProject/index.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/api/console/userProject/index.ts b/src/api/console/userProject/index.ts index 470df40..c5254e7 100644 --- a/src/api/console/userProject/index.ts +++ b/src/api/console/userProject/index.ts @@ -4,21 +4,21 @@ import request from '/@/utils/yqhp/request'; * 获取用户项目 */ export function listByUserId(params: object) { - return request({ - url: '/console/userProject', - method: 'get', - params - }); + return request({ + url: '/console/userProject', + method: 'get', + params + }); } /** * 删除用户项目 * @param userProjectId */ export function deleteUserProject(userProjectId: number) { - return request({ - url: `/console/userProject/${userProjectId}`, - method: 'delete' - }); + return request({ + url: `/console/userProject/${userProjectId}`, + method: 'delete' + }); } /** @@ -26,9 +26,9 @@ export function deleteUserProject(userProjectId: number) { * @param params */ export function createUserProject(params: object) { - return request({ - url: '/console/userProject', - method: 'post', - data: params - }); + return request({ + url: '/console/userProject', + method: 'post', + data: params + }); } -- Gitee From 95fb7699caacc9fa742e4965c4d9100efa85ee6d Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Mon, 20 Dec 2021 13:09:29 +0800 Subject: [PATCH 25/62] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/userRole/index.ts | 32 ++++++++++--------- src/api/console/userProject/index.ts | 6 ++-- .../system/user/component/UserProject.vue | 5 +-- .../yqhp/system/user/component/UserRole.vue | 5 +-- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/api/auth/userRole/index.ts b/src/api/auth/userRole/index.ts index 33049d0..92663a0 100644 --- a/src/api/auth/userRole/index.ts +++ b/src/api/auth/userRole/index.ts @@ -3,25 +3,27 @@ import request from '/@/utils/yqhp/request'; /** * 获取用户角色 */ -export function listByUserId(params: object) { - return request({ - url: '/auth/userRole', - method: 'get', - params - }); +export function listByUserId(userId: number) { + return request({ + url: '/auth/userRole', + method: 'get', + params: { + userId + } + }); } export function deleteUserRoleById(userRoleId: number) { - return request({ - url: `/auth/userRole/${userRoleId}`, - method: 'delete' - }); + return request({ + url: `/auth/userRole/${userRoleId}`, + method: 'delete' + }); } export function createUserRole(params: object) { - return request({ - url: '/auth/userRole', - method: 'post', - data: params - }); + return request({ + url: '/auth/userRole', + method: 'post', + data: params + }); } diff --git a/src/api/console/userProject/index.ts b/src/api/console/userProject/index.ts index c5254e7..d89fffb 100644 --- a/src/api/console/userProject/index.ts +++ b/src/api/console/userProject/index.ts @@ -3,11 +3,13 @@ import request from '/@/utils/yqhp/request'; /** * 获取用户项目 */ -export function listByUserId(params: object) { +export function listByUserId(userId: number) { return request({ url: '/console/userProject', method: 'get', - params + params: { + userId + } }); } /** diff --git a/src/views/yqhp/system/user/component/UserProject.vue b/src/views/yqhp/system/user/component/UserProject.vue index 8e1c1c4..327e286 100644 --- a/src/views/yqhp/system/user/component/UserProject.vue +++ b/src/views/yqhp/system/user/component/UserProject.vue @@ -13,7 +13,6 @@ import { ref, reactive, toRefs, nextTick } from 'vue'; import { getAllProjects } from '/@/api/console/project'; import { createUserProject, deleteUserProject, listByUserId } from '/@/api/console/userProject'; -import { ElMessage } from 'element-plus'; export default { name: 'UserProject', @@ -21,7 +20,6 @@ export default { const multipleTable = ref(); const state = reactive({ isShowDialog: false, - saveBtnLoading: false, ruleForm: { userId: Number, }, @@ -55,7 +53,7 @@ export default { //获取用户已有的角色并选中 const defaultSelect = async () => { if (state.projects) { - const userProjects: any = await listByUserId(state.ruleForm); + const userProjects: any = await listByUserId(state.ruleForm.userId); const uerProjectsMap: Record = {}; userProjects.forEach((userProject) => (uerProjectsMap[userProject.projectId] = userProject)); state.projects.forEach((project) => { @@ -76,7 +74,6 @@ export default { selectChange, openDialog, closeDialog, - defaultSelect, multipleTable, ...toRefs(state), }; diff --git a/src/views/yqhp/system/user/component/UserRole.vue b/src/views/yqhp/system/user/component/UserRole.vue index 8d17032..93a6285 100644 --- a/src/views/yqhp/system/user/component/UserRole.vue +++ b/src/views/yqhp/system/user/component/UserRole.vue @@ -13,7 +13,6 @@ import { ref, reactive, toRefs, nextTick } from 'vue'; import { getAllRoles } from '/@/api/auth/role'; import { listByUserId, deleteUserRoleById, createUserRole } from '/@/api/auth/userRole'; -import { ElMessage } from 'element-plus'; export default { name: 'UserRole', @@ -21,7 +20,6 @@ export default { const multipleTable = ref(); const state = reactive({ isShowDialog: false, - saveBtnLoading: false, ruleForm: { userId: Number, }, @@ -55,7 +53,7 @@ export default { //获取用户已有的角色并选中 const defaultSelect = async () => { if (state.roles) { - const userRoles: any = await listByUserId(state.ruleForm); + const userRoles: any = await listByUserId(state.ruleForm.userId); const uerRoleMap: Record = {}; userRoles.forEach((uerRole) => (uerRoleMap[uerRole.roleId] = uerRole)); state.roles.forEach((role) => { @@ -76,7 +74,6 @@ export default { selectChange, openDialog, closeDialog, - defaultSelect, multipleTable, ...toRefs(state), }; -- Gitee From 2400bc48ffed5f5b40368572bad9c1c6b5a4af05 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Mon, 20 Dec 2021 13:36:23 +0800 Subject: [PATCH 26/62] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/yqhp/system/user/component/UserProject.vue | 8 ++++---- src/views/yqhp/system/user/component/UserRole.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/yqhp/system/user/component/UserProject.vue b/src/views/yqhp/system/user/component/UserProject.vue index 327e286..cb3d919 100644 --- a/src/views/yqhp/system/user/component/UserProject.vue +++ b/src/views/yqhp/system/user/component/UserProject.vue @@ -37,20 +37,20 @@ export default { }; const selectChange = async (selection, row) => { if (row.isSelect) { - //删除用户角色 + // 删除用户项目 await deleteUserProject(row.userProjectId).finally(() => defaultSelect()); } else { - //创建用户角色 + // 创建用户项目 state.ruleForm.projectId = row.id; await createUserProject(state.ruleForm).finally(() => defaultSelect()); } }; - //获取角色信息 + // 获取项目信息 const initProject = async () => { state.projects = await getAllProjects(); defaultSelect(); }; - //获取用户已有的角色并选中 + // 获取用户已有的项目并选中 const defaultSelect = async () => { if (state.projects) { const userProjects: any = await listByUserId(state.ruleForm.userId); diff --git a/src/views/yqhp/system/user/component/UserRole.vue b/src/views/yqhp/system/user/component/UserRole.vue index 93a6285..0e60e07 100644 --- a/src/views/yqhp/system/user/component/UserRole.vue +++ b/src/views/yqhp/system/user/component/UserRole.vue @@ -37,20 +37,20 @@ export default { }; const selectChange = async (selection, row) => { if (row.isSelect) { - //删除用户角色 + // 删除用户角色 await deleteUserRoleById(row.userRoleId).finally(() => defaultSelect()); } else { - //创建用户角色 + // 创建用户角色 state.ruleForm.roleId = row.id; await createUserRole(state.ruleForm).finally(() => defaultSelect()); } }; - //获取角色信息 + // 获取角色信息 const initRoles = async () => { state.roles = await getAllRoles(); defaultSelect(); }; - //获取用户已有的角色并选中 + // 获取用户已有的角色并选中 const defaultSelect = async () => { if (state.roles) { const userRoles: any = await listByUserId(state.ruleForm.userId); -- Gitee From 97aedd90df1ab62a321825098b58e79ce978e751 Mon Sep 17 00:00:00 2001 From: jiangyitao <451988022@163.com> Date: Mon, 20 Dec 2021 14:56:29 +0800 Subject: [PATCH 27/62] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yqhp/system/user/component/UserRole.vue | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/src/views/yqhp/system/user/component/UserRole.vue b/src/views/yqhp/system/user/component/UserRole.vue index 0e60e07..1a23c25 100644 --- a/src/views/yqhp/system/user/component/UserRole.vue +++ b/src/views/yqhp/system/user/component/UserRole.vue @@ -1,6 +1,6 @@