diff --git a/src/api/api/index.ts b/src/api/api/index.ts index 581df61..514fb9b 100644 --- a/src/api/api/index.ts +++ b/src/api/api/index.ts @@ -27,3 +27,15 @@ export function moveAppMenus(data?: any) { data: data }); } + + +/** + * 新增职务分类 + */ + export function companyDutyInit(data?: any){ + return request({ + url: '/systemapi/app/companyDutyInit', + method: 'post', + data: data + }); +} \ No newline at end of file diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 04e277e..e3f3e8c 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -2561,22 +2561,22 @@ const isObject = (obj: any) => { :dprt="rangedDatePickerInTables1" @get-page-data="getPageData" /> - - +
diff --git a/src/permission.ts b/src/permission.ts index 01a0277..db33f69 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -31,7 +31,7 @@ router.beforeEach(async (to:any, from:any, next:any) => { } else { const userStore = useUserStoreHook(); const hasRoles = userStore.roles && userStore.roles.length > 0; - console.log("如果已登录,跳转首页",hasRoles) + // console.log("如果已登录,跳转首页",hasRoles) if (hasRoles) { // 未匹配到任何路由,跳转404 if (to.matched.length === 0) { @@ -43,7 +43,7 @@ router.beforeEach(async (to:any, from:any, next:any) => { try { // const { roles } = await userStore.getInfo(); const { perms,allPowerConfig } = await userStore.getInfo(); - console.log("路由权限---》",perms,allPowerConfig); + // console.log("路由权限---》",perms,allPowerConfig); // const accessRoutes = await permissionStore.generateRoutes(perms); const accessRoutes = await permissionStore.generateRoutes(allPowerConfig.menuIdAry); // console.log("路由权限--perms--》",accessRoutes); diff --git a/src/utils/request.ts b/src/utils/request.ts index eba1ce4..5a19ec2 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -40,10 +40,10 @@ service.interceptors.request.use( if (userStore.userToken) { config.headers["user-token"] = userStore.userToken; } - console.error('<---------------请求拦截---------->') - console.error('请求拦截----config------>', config.url) - console.error('请求拦截----data------>', config.data) - console.error('<---------------请求拦截---------->') + // console.error('<---------------请求拦截---------->') + // console.error('请求拦截----config------>', config.url) + // console.error('请求拦截----data------>', config.data) + // console.error('<---------------请求拦截---------->') // if (config.headers['content-type'] === 'application/json') { let { data, headers } = config //获取16位随机数 @@ -85,8 +85,8 @@ service.interceptors.response.use( let jsonData = sm4DecryptMethod(data.data, authKey) response.data.data = JSON.parse(jsonData) } - console.error('行营结果----解密结构------>', response.config.url) - console.error('行营结果----解密结构------>', response.data) + // console.error('行营结果----解密结构------>', response.config.url) + // console.error('行营结果----解密结构------>', response.data) // console.log('行营结果----解密结构------>', headers['auth-key'], response) const { code, msg } = response.data; if (code === 0 || code === 200 || code === 10001) { diff --git a/src/views/system/monitor/timing/index.vue b/src/views/system/monitor/timing/index.vue index 332e3c7..1273442 100644 --- a/src/views/system/monitor/timing/index.vue +++ b/src/views/system/monitor/timing/index.vue @@ -4,7 +4,20 @@ @ 备注: 在线人数 -->