Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/store/modules/user.js

@@ -5,27 +5,13 @@ import {
   refreshToken,
   loginOut
 } from "@/api/sys";
-import {
+import { unifiedLogin } from "@/api/user-manage";
-  unifiedLogin
-} from "@/api/user-manage";
 import Base64 from "base-64";
-import {
+import { setItem, getItem, removeAllItem } from "@/utils/storage";
-  setItem,
+import { TOKEN } from "@/constant";
-  getItem,
+import router, { resetRouter } from "@/router";
-  removeAllItem
+import { setTimeStamp } from "@/utils/auth";
-} from "@/utils/storage";
+import { TAGS_VIEW } from "@/constant/index.js";
-import {
-  TOKEN
-} from "@/constant";
-import router, {
-  resetRouter
-} from "@/router";
-import {
-  setTimeStamp
-} from "@/utils/auth";
-import {
-  TAGS_VIEW
-} from "@/constant/index.js";
 export default {
   namespaced: true,
   state: () => ({
@@ -37,7 +23,7 @@ export default {
     isReady: 0,
     userName: getItem("USERNAME") || "",
     keepLiiveRoute: [], //需要缓存的路由
-    activeId: '',//警组点击的唯一标识
+    activeId: "" //警组点击的唯一标识
   }),
   mutations: {
     setToken(state, token) {
@@ -76,7 +62,7 @@ export default {
       // state.keepLiiveRoute = state.keepLiiveRoute.filter((item) => {
       //   return item != val;
       // });
-    },
+    }
   },
   actions: {
     /*
@@ -85,36 +71,42 @@ export default {
     login(ctx, userInfo) {
       const { userName, password, kaptcha } = userInfo;
       return new Promise((resolve, reject) => {
-        login({ userName, password: Base64.encode(password), kaptcha }).then((data) => {
+        login({
-          if (data.deptList.length === 1) {
+          userName,
-            this.commit("user/setToken", data.jwtToken);
+          password: Base64.encode(password),
-            this.commit("user/setDeptId", data.deptList);
+          kaptcha,
-            this.commit("user/setUserName", data.userName);
+          ssxt: "sgxt"
-            setItem('isOatuh', 0)
-            setItem('fzUserId', data.fzUserId)
-            setItem('inDustRialId', data.inDustRialId)
-            setItem("USERNAME", data.userName);
-            setItem("roleList", data.sysRole ? data.sysRole : []);
-            setItem("SFRH", data.sfrh);
-            setItem("USERID", data.userId);
-            setItem("PermissionsInfo", data.permissionsInfo);
-            this.commit("user/setMenuList", data.menuList);
-            setItem("menusPermission", data.menuCodeSet);
-            setItem("idEntityCard", data.idEntityCard);
-            this.commit("user/setUserInfo", {
-              token: data.jwtToken,
-              permission: {
-                buttonPermission: ["removeTest", "viewTest"],
-                menus: data.menuCodeSet
-              },
-              menuList: data.menuList,
-              deptList: data.deptList
-            });
-          }
-          // 保存登录时间
-          setTimeStamp();
-          resolve(data);
         })
+          .then((data) => {
+            if (data.deptList.length === 1) {
+              this.commit("user/setToken", data.jwtToken);
+              this.commit("user/setDeptId", data.deptList);
+              this.commit("user/setUserName", data.userName);
+              setItem("isOatuh", 0);
+              setItem("fzUserId", data.fzUserId);
+              setItem("inDustRialId", data.inDustRialId);
+              setItem("USERNAME", data.userName);
+              setItem("roleList", data.sysRole ? data.sysRole : []);
+              setItem("SFRH", data.sfrh);
+              setItem("USERID", data.userId);
+              setItem("PermissionsInfo", data.permissionsInfo);
+              this.commit("user/setMenuList", data.menuList);
+              setItem("menusPermission", data.menuCodeSet);
+              setItem("idEntityCard", data.idEntityCard);
+              this.commit("user/setUserInfo", {
+                token: data.jwtToken,
+                permission: {
+                  buttonPermission: ["removeTest", "viewTest"],
+                  menus: data.menuCodeSet
+                },
+                menuList: data.menuList,
+                deptList: data.deptList
+              });
+            }
+            // 保存登录时间
+            setTimeStamp();
+            resolve(data);
+          })
           .catch((err) => {
             reject(err);
           });
@@ -124,37 +116,38 @@ export default {
      *单点登录
      */
     oatuhLogin(ctx, userInfo) {
-      const { token, systemId, } = userInfo;
+      const { token, systemId } = userInfo;
       return new Promise((resolve, reject) => {
-        unifiedLogin({ token, systemId }).then((data) => {
+        unifiedLogin({ token, systemId, ssxt: "sgxt" })
-          if (data.deptList.length === 1) {
+          .then((data) => {
-            this.commit("user/setToken", data.jwtToken);
+            if (data.deptList.length === 1) {
-            this.commit("user/setDeptId", data.deptList);
+              this.commit("user/setToken", data.jwtToken);
-            this.commit("user/setUserName", data.userName);
+              this.commit("user/setDeptId", data.deptList);
-            setItem("USERNAME", data.userName);
+              this.commit("user/setUserName", data.userName);
-            setItem('fzUserId', data.fzUserId)
+              setItem("USERNAME", data.userName);
-            setItem('inDustRialId', data.inDustRialId)
+              setItem("fzUserId", data.fzUserId);
-            setItem("SFRH", data.sfrh);
+              setItem("inDustRialId", data.inDustRialId);
-            setItem("USERID", data.userId);
+              setItem("SFRH", data.sfrh);
-            setItem("PermissionsInfo", data.permissionsInfo);
+              setItem("USERID", data.userId);
-            this.commit("user/setMenuList", data.menuList);
+              setItem("PermissionsInfo", data.permissionsInfo);
-            setItem("menusPermission", data.menuCodeSet);
+              this.commit("user/setMenuList", data.menuList);
-            setItem('isOatuh', 1)
+              setItem("menusPermission", data.menuCodeSet);
-            setItem("idEntityCard", data.idEntityCard);
+              setItem("isOatuh", 1);
-            this.commit("user/setUserInfo", {
+              setItem("idEntityCard", data.idEntityCard);
-              token: data.jwtToken,
+              this.commit("user/setUserInfo", {
-              permission: {
+                token: data.jwtToken,
-                buttonPermission: ["removeTest", "viewTest"],
+                permission: {
-                menus: data.menuCodeSet
+                  buttonPermission: ["removeTest", "viewTest"],
-              },
+                  menus: data.menuCodeSet
-              menuList: data.menuList,
+                },
-              deptList: data.deptList
+                menuList: data.menuList,
-            });
+                deptList: data.deptList
-          }
+              });
-          // 保存登录时间
+            }
-          setTimeStamp();
+            // 保存登录时间
-          resolve(data);
+            setTimeStamp();
-        })
+            resolve(data);
+          })
           .catch((err) => {
             reject(err);
           });
@@ -220,7 +213,7 @@ export default {
         this.commit("user/setUserName", "admin");
         this.commit("user/setUserInfo", {});
         this.commit("permission/resetrouteReady", 0);
-        const isOatuh = getItem('isOatuh')
+        const isOatuh = getItem("isOatuh");
         this.commit("permission/deleteRouter");
         removeAllItem();
         // 待补充 清理权限相关的配置