From 6e01d7c891908f091d07b18fbc4d31141d1d82d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Sat, 6 Jul 2024 17:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=B3=BB=E7=BB=9F=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/model/auth.js | 63 ++++++ src/api/model/oss.js | 7 + src/api/model/system.js | 218 +++++++++++++++++++- src/api/model/user.js | 28 +++ src/assets/icons/AbilityAuthorization.vue | 13 ++ src/assets/icons/DataAuthorization.vue | 13 ++ src/assets/icons/Delete.vue | 13 ++ src/assets/icons/Edit.vue | 13 ++ src/assets/icons/Review.vue | 13 ++ src/assets/icons/Revoke.vue | 15 ++ src/assets/icons/See.vue | 13 ++ src/assets/icons/UserList.vue | 13 ++ src/assets/icons/index.js | 11 + src/assets/icons/menu/System.vue | 2 +- src/components/scTable/index.vue | 22 +- src/config/table.js | 27 ++- src/layout/index.vue | 4 +- src/style/fix.scss | 29 ++- src/utils/request.js | 139 ++++++++----- src/utils/tool.js | 83 ++++++++ src/views/login/components/passwordForm.vue | 1 - src/views/login/components/phoneForm.vue | 89 +++++--- src/views/order/workOrder.vue | 16 +- src/views/setting/company/index.vue | 196 +++++++++++++++++- src/views/setting/company/save.vue | 177 ++++++++++++++++ src/views/setting/company/see.vue | 71 +++++++ src/views/setting/deptMag/index.vue | 87 ++++---- src/views/setting/deptMag/save.vue | 3 - src/views/setting/role/index.vue | 49 ++--- src/views/setting/role/save.vue | 5 +- src/views/setting/user/index.vue | 84 +++++--- src/views/setting/user/save.vue | 2 +- src/views/userCenter/index.vue | 2 +- src/views/userCenter/user/account.vue | 7 +- src/views/userCenter/user/bind.vue | 13 +- src/views/userCenter/user/password.vue | 51 ++--- 37 files changed, 1336 insertions(+), 258 deletions(-) create mode 100644 src/assets/icons/AbilityAuthorization.vue create mode 100644 src/assets/icons/DataAuthorization.vue create mode 100644 src/assets/icons/Delete.vue create mode 100644 src/assets/icons/Edit.vue create mode 100644 src/assets/icons/Review.vue create mode 100644 src/assets/icons/Revoke.vue create mode 100644 src/assets/icons/See.vue create mode 100644 src/assets/icons/UserList.vue create mode 100644 src/views/setting/company/save.vue create mode 100644 src/views/setting/company/see.vue diff --git a/.env.development b/.env.development index 72535fb..f6a8a1a 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ NODE_ENV = development # 标题 -VUE_APP_TITLE = 德木测试 +VUE_APP_TITLE = 隆姿集团 # 象纬云科 # 接口地址 diff --git a/src/api/model/auth.js b/src/api/model/auth.js index fee3f83..6c004ff 100644 --- a/src/api/model/auth.js +++ b/src/api/model/auth.js @@ -9,4 +9,67 @@ export default { return await http.post(this.url, data); }, }, + phoneLogin: { + url: `${config.API_URL}/mobile.login`, + name: "手机验证码登录获取TOKEN", + post: async function (data = {}) { + return await http.post(this.url, data); + }, + }, + wechatLogin:{ + url: `${config.API_URL}/open.platform.oauth.login`, + name: "微信扫码登录", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + wechatCode:{ + url: `${config.API_URL}/open.platform.scan.code`, + name: "获取微信扫码二维码", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + bindWechat:{ + url: `${config.API_URL}/official.qrcode`, + name: "微信绑定获取二维码地址", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + dingTalkLogin:{ + url: `${config.API_URL}/ding.app.login.scan.code`, + name: "钉钉扫码登录", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + dingTalkCode:{ + url: `${config.API_URL}/ding.app.login.scan.url`, + name: "钉钉登录二维码地址", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + bindDingTalk:{ + url: `${config.API_URL}/ding.app.login.scan.url.bind`, + name: "获取钉钉绑定二维码地址", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + bindDingTalkUser:{ + url: `${config.API_URL}/ding.app.bind.user`, + name: "钉钉绑定用户", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + unbindUser:{ + url: `${config.API_URL}/unbind.user`, + name: "解除绑定", + post: async function (params) { + return await http.post(this.url, params); + }, + }, }; diff --git a/src/api/model/oss.js b/src/api/model/oss.js index 25f4cc8..62127a6 100644 --- a/src/api/model/oss.js +++ b/src/api/model/oss.js @@ -8,5 +8,12 @@ export default { post: async function (params) { return await http.oss(this.url, params); }, + }, + status: { + url: `${config.API_URL}/common.active.status.list`, + name: "获取系统禁用启用下拉列表", + post: async function (params) { + return await http.post(this.url, params); + }, } }; diff --git a/src/api/model/system.js b/src/api/model/system.js index 8317b84..a060f2d 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -43,30 +43,236 @@ export default { }, role: { list: { - url: `${config.API_URL}/system/role/list2`, + url: `${config.API_URL}/roles.list`, name: "获取角色列表", get: async function (params) { - return await http.get(this.url, params); + return await http.post(this.url, params); + }, + }, + add:{ + url: `${config.API_URL}/roles.add`, + name: "角色增加", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete:{ + url: `${config.API_URL}/roles.delete`, + name: "角色删除", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + status:{ + url: `${config.API_URL}/roles.status`, + name: "角色状态", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + users:{ + url: `${config.API_URL}/roles.users`, + name: "角色成员", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + removeUser:{ + url: `${config.API_URL}/roles.removed.users`, + name: "移除角色成员", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + addUser:{ + url: `${config.API_URL}/roles.add.users`, + name: "添加角色成员", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + tree:{ + url: `${config.API_URL}/roles.dept.tree`, + name: "部门树", + post: async function (params) { + return await http.post(this.url, params); + }, + } + }, + company:{ + list: { + url: `${config.API_URL}/organization.list`, + name: "公司列表", + get: async function (params) { + return await http.post(this.url, params); + }, + }, + add: { + url: `${config.API_URL}/organization.add`, + name: "公司增加", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + info: { + url: `${config.API_URL}/organization.info`, + name: "公司详情", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + status: { + url: `${config.API_URL}/organization.update.status`, + name: "公司状态", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete: { + url: `${config.API_URL}/organization.delete`, + name: "公司删除", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + select:{ + url: `${config.API_URL}/organization.name.list`, + name: "公司下拉选择", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + typeSelect:{ + url: `${config.API_URL}/common.company.type.list`, + name: "公司类型下拉选择", + post: async function (params) { + return await http.post(this.url, params); }, }, }, dept: { list: { - url: `${config.API_URL}/system/dept/list`, + url: `${config.API_URL}/dept.list`, name: "获取部门列表", get: async function (params) { - return await http.get(this.url, params); + return await http.post(this.url, params); }, }, + add: { + url: `${config.API_URL}/dept.add`, + name: "部门增加", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + active:{ + url: `${config.API_URL}/dept.list.active`, + name: "部门列表启用", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete: { + url: `${config.API_URL}/dept.delete`, + name: "部门删除", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + info: { + url: `${config.API_URL}/dept.info`, + name: "部门详情", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + update:{ + url: `${config.API_URL}/dept.update`, + name: "部门更新", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + status:{ + url: `${config.API_URL}/dept.update.status`, + name: "部门状态", + post: async function (params) { + return await http.post(this.url, params); + }, + } }, user: { list: { - url: `${config.API_URL}/system/user/list`, + url: `${config.API_URL}/user.list`, name: "获取用户列表", get: async function (params) { - return await http.get(this.url, params); + return await http.post(this.url, params); }, }, + add:{ + url: `${config.API_URL}/user.add`, + name: "用户新增", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete:{ + url: `${config.API_URL}/user.delete`, + name: "用户删除", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + status:{ + url: `${config.API_URL}/user.status.update`, + name: "用户状态", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + generateRegistration:{ + url: `${config.API_URL}/generate.registration.challenge`, + name: "passKey 创建", + post: async function (params) { + return await http.post(this.url, params); + } + }, + verifyResponse:{ + url: `${config.API_URL}/verify.registration.response`, + name: "passKey 创建认证", + post: async function (params) { + return await http.post(this.url, params); + } + }, + + generateAuthentication:{ + url: `${config.API_URL}/generate.authentication.challenge`, + name: "passKey登录生成", + post: async function (params) { + return await http.post(this.url, params); + } + }, + verifyAuthentication:{ + url: `${config.API_URL}/verify.authentication.response`, + name: "passKey 登录认证", + post: async function (params) { + return await http.post(this.url, params); + } + }, + publishList:{ + url: `${config.API_URL}/publish.key.list`, + name: "passKey 指纹列表", + post: async function (params) { + return await http.post(this.url, params); + } + }, + renameAlias:{ + url: `${config.API_URL}/rename.alias`, + name: "passKey 指纹重命名", + post: async function (params) { + return await http.post(this.url, params); + } + }, }, app: { list: { diff --git a/src/api/model/user.js b/src/api/model/user.js index 135d720..a21f5b9 100644 --- a/src/api/model/user.js +++ b/src/api/model/user.js @@ -2,6 +2,13 @@ import config from "@/config"; import http from "@/utils/request"; export default { + verifyCode: { + url: `${config.API_URL}/sms.code.send`, + name: "获取短信验证码", + post: async function (params) { + return await http.post(this.url, params); + } + }, getInfo: { url: `${config.API_URL}/user.bind.info`, name: "获取绑定（微信、钉钉）个人中心", @@ -23,6 +30,27 @@ export default { return await http.post(this.url, params); }, }, + editUser:{ + url: `${config.API_URL}/user.update.me`, + name: "修改个人信息", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + bindMobile:{ + url: `${config.API_URL}/user.bind.mobile`, + name: "绑定手机号", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + editPass:{ + url: `${config.API_URL}/user.re.pwd`, + name: "修改个人密码", + post: async function (params) { + return await http.post(this.url, params); + }, + }, timeoutConfig:{ url: `${config.API_URL}/system.login.timeout.config`, name: "登录超时退出配置", diff --git a/src/assets/icons/AbilityAuthorization.vue b/src/assets/icons/AbilityAuthorization.vue new file mode 100644 index 0000000..51ab828 --- /dev/null +++ b/src/assets/icons/AbilityAuthorization.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/DataAuthorization.vue b/src/assets/icons/DataAuthorization.vue new file mode 100644 index 0000000..ceeaa4e --- /dev/null +++ b/src/assets/icons/DataAuthorization.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/Delete.vue b/src/assets/icons/Delete.vue new file mode 100644 index 0000000..64e9ff8 --- /dev/null +++ b/src/assets/icons/Delete.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/Edit.vue b/src/assets/icons/Edit.vue new file mode 100644 index 0000000..3fb63d8 --- /dev/null +++ b/src/assets/icons/Edit.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/Review.vue b/src/assets/icons/Review.vue new file mode 100644 index 0000000..c4e5dbf --- /dev/null +++ b/src/assets/icons/Review.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/Revoke.vue b/src/assets/icons/Revoke.vue new file mode 100644 index 0000000..871f583 --- /dev/null +++ b/src/assets/icons/Revoke.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/assets/icons/See.vue b/src/assets/icons/See.vue new file mode 100644 index 0000000..0717464 --- /dev/null +++ b/src/assets/icons/See.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/UserList.vue b/src/assets/icons/UserList.vue new file mode 100644 index 0000000..4154a4d --- /dev/null +++ b/src/assets/icons/UserList.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 8675a64..8e6505d 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -21,6 +21,17 @@ export { default as Secure } from './Secure.vue' export { default as UserLog } from './Log.vue' export { default as WechartRound } from './WechartRound.vue' +// 列表按钮 +export { default as Delete } from './Delete.vue' +export { default as Edit } from './Edit.vue' +export { default as Review } from './Review.vue' +export { default as Revoke } from './Revoke.vue' +export { default as See } from './See.vue' +export { default as AbilityAuthorization } from './AbilityAuthorization.vue' +export { default as DataAuthorization } from './DataAuthorization.vue' +export { default as UserList } from './UserList.vue' + + export { default as Home } from './menu/Home.vue' export { default as Setup } from './menu/Setup.vue' export { default as Other } from './menu/Other.vue' diff --git a/src/assets/icons/menu/System.vue b/src/assets/icons/menu/System.vue index 01ca1f9..cce6d01 100644 --- a/src/assets/icons/menu/System.vue +++ b/src/assets/icons/menu/System.vue @@ -1,5 +1,5 @@ - diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue new file mode 100644 index 0000000..22f643b --- /dev/null +++ b/src/views/setting/company/save.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/setting/company/see.vue b/src/views/setting/company/see.vue new file mode 100644 index 0000000..c32cef0 --- /dev/null +++ b/src/views/setting/company/see.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/setting/deptMag/index.vue b/src/views/setting/deptMag/index.vue index 5f8fa7d..24490b5 100644 --- a/src/views/setting/deptMag/index.vue +++ b/src/views/setting/deptMag/index.vue @@ -1,44 +1,39 @@