From e8dc252408133d94537c1c7ee9eaae8e2387aae1 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 22 Mar 2024 18:49:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BB=A5=E5=8F=8A=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/account.js | 8 +- src/assets/js/api/loginSign.js | 1 + src/components/header.vue | 30 ++++- src/router/index.js | 5 + src/views/companyAdmin/companyDiagram.vue | 140 +++++++++++++++++----- src/views/companyAdmin/layout.vue | 2 +- src/views/home/login_v2.vue | 70 +++++------ src/views/jxjadmin/systemSettings.vue | 61 +++++++++- src/views/workSpace/index.vue | 52 ++++++++ 9 files changed, 294 insertions(+), 75 deletions(-) create mode 100644 src/views/workSpace/index.vue diff --git a/src/assets/js/api/account.js b/src/assets/js/api/account.js index 910faa41..7bdcc9ea 100644 --- a/src/assets/js/api/account.js +++ b/src/assets/js/api/account.js @@ -1,11 +1,17 @@ /** * api接口统一管理 */ -import {post} from '../http' +import {get,post} from '../http' export const addSystemUserApi = data => post('xmgl/systemUser/add', data); //添加账号信息 export const editSystemUserApi = data => post('xmgl/systemUser/edit', data); //编辑账号信息 export const deleteSystemUserApi = data => post('xmgl/systemUser/delete', data); //删除账号信息 export const getSystemUserBySnApi = data => post('xmgl/systemUser/getSystemUserBySn', data); //根据企业或项目SN查找账号列表 +// 新用户审核 +// 列表 +export const getUserAuditListApi = data => get('xmgl/xzRegistry/page', data); //根据企业或项目SN查找账号列表 +export const userAuditApi = data => post('xmgl/xzRegistry/approval', data); //根据企业或项目SN查找账号列表 +export const userAuditNotPassApi = data => get('xmgl/xzRegistry/page', data); //根据企业或项目SN查找账号列表 + diff --git a/src/assets/js/api/loginSign.js b/src/assets/js/api/loginSign.js index e5f218d9..7685ad63 100644 --- a/src/assets/js/api/loginSign.js +++ b/src/assets/js/api/loginSign.js @@ -4,6 +4,7 @@ import {post,get} from '../http' export const registerApi = data => post('xmgl/base/register', data); //注册 +export const newRegisterApi = data => post('xmgl/xzRegistry/add', data); //注册 export const loginPhoneApi = data => post('xmgl/base/loginPhone', data); //手机号登录 export const loginApi = data => post('xmgl/base/login', data); //账号密码登录 export const loginApiMD5 = (data) => post("xmgl/base/md5/login", data); //账号密码登录 MD5加密 diff --git a/src/components/header.vue b/src/components/header.vue index 06bad55f..615c7800 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -1,6 +1,6 @@