sasp-admin 0.2.62 → 0.2.64

package/src/assets/js/api/apiAdmin.js

@@ -6,6 +6,10 @@ let objResult = {
         logout: "/loginController/logout",
         setWebUrl: '/loginController/setWebUrl',
         loginCredential: "/loginController/loginCredential",
+        // 切换当前登录部门（一人多部门场景），参数为 SYS_ORG_POS_USER.ID
+        switchDept: "/loginController/switchDept",
+        // 获取会话中的当前部门（含全部可选部门 deptList）
+        currentDept: "/loginController/currentDept",
     },
     //密码规则
     pwdRules: {
@@ -78,6 +82,7 @@ let objResult = {
         roleSubmitByTenant:'/roleController/roleSubmitByTenant',
         roleIssued:"/roleController/roleIssued", // 角色权限批量授权
         authRoleAllocate:"/roleController/authRoleAllocate", // 角色权限下发
+        copyRole:"/roleController/copyRole", // 复制角色及其关联数据
     },
     roleMenuOpt: {
         url: "/roleMenuOptController",
@@ -180,6 +185,8 @@ let objResult = {
         loadfile:"/sysOrgPosUserController/loadfile",
         deletefile:"/sysOrgPosUserController/deletefile",
         checkAdminUserBind:"/sysOrgPosUserController/checkAdminUserBind",
+        getSuperOrgCharge:"/sysOrgPosUserController/getSuperOrgCharge",
+        getCareerGroupCharge:"/sysOrgPosUserController/getCareerGroupCharge",
         batchAddPosUserByStation:"/sysOrgPosUserController/batchAddPosUserByStation"
     },
     sysUser: {
@@ -330,6 +337,7 @@ let objResult = {
         getLoginUserModuleAndMenus: "/authController/getLoginUserModuleAndMenus",
         getOwnMenuOpt: "/authController/getOwnMenuOpt",
         getCommonUserAllocateMenu: "/authController/getCommonUserAllocateMenu",
+        getUserRoles: "/authController/getUserRoles",
     },
     complextab: {
         url: "/complextabController",
@@ -354,6 +362,7 @@ let objResult = {
         add: "/safeRegionController/add",
         count: "/safeRegionController/count",
         find: "/safeRegionController/find",
+        getById:"/safeRegionController/getById",
         updateIsOpen:"/safeRegionController/updateIsOpen",
         updateOpenStatus:"/safeRegionController/updateOpenStatus",
         switchEconOneToMany:"/safeRegionController/switchEconOneToMany",
@@ -419,6 +428,7 @@ let objResult = {
     safeSpvEcon:{
         url:"/safeSpvEconController",
         find:"/safeSpvEconController/find",
+        findData:"/safeSpvEconController/findData",
         getEconSelected:"/safeSpvEconController/getEconSelected",
         batchAdd:"/safeSpvEconController/batchAdd",
 

package/src/assets/js/global/dataGlobal.js

@@ -49,13 +49,15 @@ export default {
         parentId = parentId || "";
         ifRefresh = ifRefresh || false;
         return new Promise(function (resolve) {
-
             if (vm.OBJ_DATAS[typeId + "_" + parentId] && !ifRefresh) {
                 resolve(vm.OBJ_DATAS[typeId + "_" + parentId]);
             } else {
                 let objDatas = [];
                 axios.post(apiAdmin.data.getDataByType, {typeId: typeId, parentId: parentId}).then(function (res) {
-                    objDatas.push(...res.data);
+                    (res.data || []).forEach(item => {
+                        objDatas.push(item);
+                        vm.setKeyName(item.id, item.dataName);
+                    })
                     vm.OBJ_DATAS[typeId + "_" + parentId] = objDatas;
                     resolve(objDatas);
                 });
@@ -181,7 +183,9 @@ export default {
     getDataByIds(ids){
         let vm = this;
         if (!ids) {
-            return "";
+            return new Promise(resolve => {
+                resolve("");
+            });
         }
         return new Promise(resolve=>{
             let dataNameArr = [];

package/src/assets/js/global/userGlobal.js

@@ -62,14 +62,19 @@ export default {
         setLocalJSON('LOGINUSER', user);
     },
     setLoginToken(token) {
-        setLocalJSON('USERTOKEN', "pl_token_" + token);
+        let customToken = window.customToken;
+        if(!customToken) {
+            customToken = "pl_token_";
+        }
+        setLocalJSON('USERTOKEN', customToken + token);
 
-        localStorage["Authorization" + (window.projectSuffix || "")] = "pl_token_" + token;
-        axios.defaults.headers.common["Authorization"] = "pl_token_" + token;
+        localStorage["Authorization" + (window.projectSuffix || "")] = customToken + token;
+        axios.defaults.headers.common["Authorization"] = customToken + token;
     },
 
     clearLoginToken(token) { // 登陆前清空登录认证token
         setLocalJSON('USERTOKEN', "");
+        window.spcpToken = "";
         localStorage["Authorization" + (window.projectSuffix || "")] = "";
         axios.defaults.headers.common["Authorization"] = "";
     },
@@ -206,6 +211,7 @@ export default {
     logout() {
         removeLocal("LOGINUSER");
         removeLocal("USERTOKEN");
+        window.spcpToken = "";
         localStorage.loginUser = null;
         localStorage["Authorization" + (window.projectSuffix || "")] = "";
         axios.defaults.headers.common["Authorization"] = "";