Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
836ad572 1 parent efe3cf43

菜单，用户信息接口增加，基础信息逻辑修改

Inline Side-by-side
Showing 8 changed files with 33 additions and 107 deletions
1 import request from "@/utils/request"; 1 import request from "@/utils/request";
2 2
3 +// 获取fcl登录地址
4 +export function fclInit() {
5 + return request({
6 + url: "/manager-server/auth/init",
7 + method: "post",
8 + });
9 +}
10 +
3 // 获取用户详细信息 11 // 获取用户详细信息
4 -export function getInfo(uid) { 12 +export function getInfo() {
5 return request({ 13 return request({
6 - url: "/icleartw/sysUser/getUserDetail/" + uid, 14 + url: "/manager-server/user/getUser",
7 method: "get", 15 method: "get",
8 }); 16 });
9 } 17 }
...@@ -72,10 +80,3 @@ export function verifyResetPwd(data) { ...@@ -72,10 +80,3 @@ export function verifyResetPwd(data) {
72 method: "get", 80 method: "get",
73 }); 81 });
74 } 82 }
...\ No newline at end of file ...\ No newline at end of file
75 -// 获取fcl登录地址
76 -export function fclInit() {
77 - return request({
78 - url: "/icleartw/auth/init/" ,
79 - method: "post",
80 - });
81 -}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,7 +3,7 @@ import request from "@/utils/request"; ...@@ -3,7 +3,7 @@ import request from "@/utils/request";
3 // 获取路由 3 // 获取路由
4 export const getRouters = () => { 4 export const getRouters = () => {
5 return request({ 5 return request({
6 - url: "/icleartw/sysUser/userMenu", 6 + url: "/manager-server/privilege/getPrivilege",
7 method: "get", 7 method: "get",
8 }); 8 });
9 }; 9 };
......
...@@ -90,7 +90,6 @@ export default { ...@@ -90,7 +90,6 @@ export default {
90 saveTableHeader({ tableName: this.tableName, idList: this.transferValue }).then(res => { 90 saveTableHeader({ tableName: this.tableName, idList: this.transferValue }).then(res => {
91 if (res.code === 200) { 91 if (res.code === 200) {
92 obj[this.tableName] = res.data 92 obj[this.tableName] = res.data
93 - this.$store.dispatch('SavetableHeader', obj)
94 this.msgSuccess('操作成功') 93 this.msgSuccess('操作成功')
95 this.close(1) 94 this.close(1)
96 } else { 95 } else {
......
...@@ -3,7 +3,7 @@ import store from "./store"; ...@@ -3,7 +3,7 @@ import store from "./store";
3 import { Message, MessageBox } from "element-ui"; 3 import { Message, MessageBox } from "element-ui";
4 import { getToken } from "@/utils/auth"; 4 import { getToken } from "@/utils/auth";
5 5
6 -const whiteList = ["/login", "/auth-redirect", "/bind", "/register","/redjrectLogin"]; 6 +const whiteList = ["/login", "/auth-redirect", "/bind", "/register", "/redjrectLogin"];
7 router.beforeEach((to, from, next) => { 7 router.beforeEach((to, from, next) => {
8 if (getToken()) { 8 if (getToken()) {
9 let path = '' 9 let path = ''
...@@ -15,7 +15,7 @@ router.beforeEach((to, from, next) => { ...@@ -15,7 +15,7 @@ router.beforeEach((to, from, next) => {
15 store 15 store
16 .dispatch("GetInfo") 16 .dispatch("GetInfo")
17 .then((res) => { 17 .then((res) => {
18 - if (res.success) { 18 + if (res.code === 200) {
19 store.dispatch("GenerateRoutes").then((accessRoutes) => { 19 store.dispatch("GenerateRoutes").then((accessRoutes) => {
20 router.addRoutes(accessRoutes); // 动态添加可访问路由表 20 router.addRoutes(accessRoutes); // 动态添加可访问路由表
21 next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 21 next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
...@@ -33,7 +33,6 @@ router.beforeEach((to, from, next) => { ...@@ -33,7 +33,6 @@ router.beforeEach((to, from, next) => {
33 } 33 }
34 } 34 }
35 } else { 35 } else {
36 - store.dispatch("RemoveInfo");
37 // 没有token 36 // 没有token
38 if (whiteList.indexOf(to.path) !== -1) { 37 if (whiteList.indexOf(to.path) !== -1) {
39 // 在免登录白名单，直接进入 38 // 在免登录白名单，直接进入
...@@ -44,4 +43,4 @@ router.beforeEach((to, from, next) => { ...@@ -44,4 +43,4 @@ router.beforeEach((to, from, next) => {
44 } 43 }
45 }); 44 });
46 45
47 -router.afterEach(() => {}); 46 +router.afterEach(() => { });
......
1 import { constantRoutes } from "@/router"; 1 import { constantRoutes } from "@/router";
2 -import { getRouters } from "@/api/menu";
3 import Layout from "@/layout/index"; 2 import Layout from "@/layout/index";
4 import ParentView from "@/components/ParentView"; 3 import ParentView from "@/components/ParentView";
5 -import { getInfo } from "@/api/login"; 4 +import { getRouters } from "@/api/menu.js"
6 -import { getUid } from "@/utils/auth";
7 const permission = { 5 const permission = {
8 state: { 6 state: {
9 routes: [], 7 routes: [],
...@@ -26,7 +24,7 @@ const permission = { ...@@ -26,7 +24,7 @@ const permission = {
26 const index = [ 24 const index = [
27 { 25 {
28 path: "index", 26 path: "index",
29 - meta: { title: "首页", icon: "home" }, 27 + meta: { title: "Index", icon: "home" },
30 }, 28 },
31 ]; 29 ];
32 state.topbarRouters = routes.concat(index); 30 state.topbarRouters = routes.concat(index);
...@@ -46,11 +44,11 @@ const permission = { ...@@ -46,11 +44,11 @@ const permission = {
46 // 生成路由 44 // 生成路由
47 GenerateRoutes({ commit }) { 45 GenerateRoutes({ commit }) {
48 return new Promise((resolve) => { 46 return new Promise((resolve) => {
49 - // console.log(constantRoutes, "constantRoutes");
50 // 向后端请求路由数据 47 // 向后端请求路由数据
51 - getInfo(getUid()).then((res) => { 48 + getRouters().then((res) => {
52 - const sdata = JSON.parse(JSON.stringify(routeItemInfo(res.data.meunInfoList))); 49 + console.log(res);
53 - const rdata = JSON.parse(JSON.stringify(routeItemInfo(res.data.meunInfoList))); 50 + const sdata = JSON.parse(JSON.stringify(routeItemInfo(res.data)));
51 + const rdata = JSON.parse(JSON.stringify(routeItemInfo(res.data)));
54 const sidebarRoutes = filterAsyncRouter(sdata); 52 const sidebarRoutes = filterAsyncRouter(sdata);
55 const rewriteRoutes = filterAsyncRouter(rdata, false, true); 53 const rewriteRoutes = filterAsyncRouter(rdata, false, true);
56 rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true }); 54 rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
...@@ -122,19 +120,18 @@ function routeItemInfo(val) { ...@@ -122,19 +120,18 @@ function routeItemInfo(val) {
122 let childrens = []; 120 let childrens = [];
123 arr.forEach((item) => { 121 arr.forEach((item) => {
124 let obj = {}; 122 let obj = {};
125 - let obj1 = {};
126 obj = { 123 obj = {
127 children: [], 124 children: [],
128 - component: item.parentId == 0 ? "Layout" : `/${item.name}`, 125 + component: item.parentId == 0 ? "Layout" : `/${item.path}`,
129 hidden: false, 126 hidden: false,
130 id: item.id, 127 id: item.id,
131 meta: { 128 meta: {
132 - title: item.title, 129 + title: item.name,
133 icon: item.icon, 130 icon: item.icon,
134 }, 131 },
135 parentId: item.parentId, 132 parentId: item.parentId,
136 - name: item.name, 133 + name: item.code,
137 - path: item.parentId == 0 ? item.path : item.name, 134 + path: item.parentId == 0 ? item.path == null ? '' : item.path : item.code,
138 }; 135 };
139 item.parentId != 0 ? childrens.push(obj) : router.push(obj); 136 item.parentId != 0 ? childrens.push(obj) : router.push(obj);
140 }); 137 });
...@@ -142,8 +139,6 @@ function routeItemInfo(val) { ...@@ -142,8 +139,6 @@ function routeItemInfo(val) {
142 } 139 }
143 //对ext框架route数据结构进行初始化 140 //对ext框架route数据结构进行初始化
144 function setRoute(route, childrens) { 141 function setRoute(route, childrens) {
145 - let rootRoute = {};
146 - let arr = [];
147 childrens.forEach((item) => { 142 childrens.forEach((item) => {
148 route.forEach((val) => { 143 route.forEach((val) => {
149 if (item.parentId == val.id) { 144 if (item.parentId == val.id) {
......
1 import { userLogin, logout, getInfo } from "@/api/login"; 1 import { userLogin, logout, getInfo } from "@/api/login";
2 -import { getTableHeader } from "@/api/menu"; 2 +import { getToken, setToken, removeToken } from "@/utils/auth";
3 -import { changeCurrentPort } from "@/api/system/user.js"; 3 +import { MessageBox } from "element-ui";
4 -import { getToken, setToken, removeToken, getUid } from "@/utils/auth";
5 -import { MessageBox, Message } from "element-ui";
6 4
7 const user = { 5 const user = {
8 state: { 6 state: {
...@@ -12,10 +10,6 @@ const user = { ...@@ -12,10 +10,6 @@ const user = {
12 id: "", 10 id: "",
13 avatar: "", 11 avatar: "",
14 activePortName: "", 12 activePortName: "",
15 - portNames: [],
16 - roles: [],
17 - permissions: [],
18 - tableHeader: null,
19 appLoading: false, 13 appLoading: false,
20 }, 14 },
21 15
...@@ -39,18 +33,6 @@ const user = { ...@@ -39,18 +33,6 @@ const user = {
39 state.activePortName = activePortName; 33 state.activePortName = activePortName;
40 sessionStorage.setItem("portName", activePortName); 34 sessionStorage.setItem("portName", activePortName);
41 }, 35 },
42 - SET_PORTNAMES: (state, portNames) => {
43 - state.portNames = portNames;
44 - },
45 - SET_ROLES: (state, roles) => {
46 - state.roles = roles;
47 - },
48 - SET_PERMISSIONS: (state, permissions) => {
49 - state.permissions = permissions;
50 - },
51 - SAVE_TABLEHEADER: (state, table) => {
52 - state.tableHeader = table;
53 - },
54 SET_APP_LOADING(state, newValue) { 36 SET_APP_LOADING(state, newValue) {
55 state.appLoading = newValue; 37 state.appLoading = newValue;
56 } 38 }
...@@ -70,7 +52,7 @@ const user = { ...@@ -70,7 +52,7 @@ const user = {
70 commit("SET_TOKEN", res.data); 52 commit("SET_TOKEN", res.data);
71 resolve(); 53 resolve();
72 } else { 54 } else {
73 - MessageBox.alert(res.msg, "註意", { 55 + MessageBox.alert(res.msg, "Tip", {
74 dangerouslyUseHTMLString: true, 56 dangerouslyUseHTMLString: true,
75 }); 57 });
76 return Promise.reject(new Error(msg)); 58 return Promise.reject(new Error(msg));
...@@ -82,44 +64,14 @@ const user = { ...@@ -82,44 +64,14 @@ const user = {
82 }); 64 });
83 }, 65 },
84 66
85 - //获取表头
86 - GetTableHeaders({ commit, state }) {
87 - return new Promise((resolve, reject) => {
88 - getTableHeader()
89 - .then((res) => {
90 - if (res.code === 200) {
91 - commit("SAVE_TABLEHEADER", res.data);
92 - }
93 - resolve(res);
94 - })
95 - .catch((err) => {
96 - reject(err);
97 - });
98 - });
99 - },
100 -
101 - //保存表头
102 - SavetableHeader({ commit, state }, data) {
103 - commit("SAVE_TABLEHEADER", data);
104 - },
105 -
106 // 获取用户信息 67 // 获取用户信息
107 GetInfo({ commit, state }) { 68 GetInfo({ commit, state }) {
108 -
109 return new Promise((resolve, reject) => { 69 return new Promise((resolve, reject) => {
110 - getInfo(getUid()) 70 + getInfo()
111 .then((res) => { 71 .then((res) => {
112 if (res.code === 200) { 72 if (res.code === 200) {
113 const user = res.data; 73 const user = res.data;
114 - // const avatar = 74 + commit("SET_USERDATA", res.data);
115 - // user.avatar == ""
116 - // ? ""
117 - // : process.env.VUE_APP_BASE_API + user.avatar;
118 - // let ports = [];
119 - // commit("SET_ID", user.id);
120 - // commit("SET_NAME", user.userName);
121 - commit("SET_USERDATA", res.data.userInfo);
122 - // commit("SET_AVATAR", avatar);
123 resolve(res); 75 resolve(res);
124 } 76 }
125 }) 77 })
...@@ -129,28 +81,11 @@ const user = { ...@@ -129,28 +81,11 @@ const user = {
129 }); 81 });
130 }, 82 },
131 83
132 - //切换口岸
133 - changePort({ commit }, portName) {
134 - return new Promise((resolve, reject) => {
135 - changeCurrentPort({ portName: portName })
136 - .then((res) => {
137 - if (res.code === 200) {
138 - commit("SET_ACTIVEPORTNAME", portName);
139 - }
140 - resolve(res);
141 - })
142 - .catch((err) => {
143 - reject(err);
144 - });
145 - });
146 - },
147 -
148 // 退出系统 84 // 退出系统
149 LogOut({ commit, state }) { 85 LogOut({ commit, state }) {
150 return new Promise((resolve, reject) => { 86 return new Promise((resolve, reject) => {
151 logout(state.token) 87 logout(state.token)
152 .then(() => { 88 .then(() => {
153 - // window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout";//wsso系统跳转
154 commit("SET_TOKEN", ""); 89 commit("SET_TOKEN", "");
155 commit("SET_USERDATA", {}); 90 commit("SET_USERDATA", {});
156 removeToken(); 91 removeToken();
...@@ -165,8 +100,6 @@ const user = { ...@@ -165,8 +100,6 @@ const user = {
165 RemoveInfo({ commit }) { 100 RemoveInfo({ commit }) {
166 return new Promise((resolve, reject) => { 101 return new Promise((resolve, reject) => {
167 commit("SET_USERDATA", { user: {} }); 102 commit("SET_USERDATA", { user: {} });
168 - commit("SET_ROLES", []);
169 - commit("SET_PERMISSIONS", []);
170 commit("SET_NAME", ""); 103 commit("SET_NAME", "");
171 commit("SET_AVATAR", ""); 104 commit("SET_AVATAR", "");
172 resolve(); 105 resolve();
......
1 //import Cookies from 'js-cookie' 1 //import Cookies from 'js-cookie'
2 2
3 -const TokenKey = "IClear-Token"; 3 +const TokenKey = "preCliearnce-Token";
4 4
5 -const Uid = "IClear-Uid"; 5 +const Uid = "preCliearnce-Uid";
6 6
7 export function getToken() { 7 export function getToken() {
8 //return Cookies.get(TokenKey) 8 //return Cookies.get(TokenKey)
...@@ -31,7 +31,7 @@ export function removeToken() { ...@@ -31,7 +31,7 @@ export function removeToken() {
31 31
32 32
33 export function getUid() { 33 export function getUid() {
34 - let locUid=localStorage.getItem(Uid); 34 + let locUid = localStorage.getItem(Uid);
35 return locUid ? locUid : 0; 35 return locUid ? locUid : 0;
36 36
37 } 37 }
......
...@@ -13,9 +13,8 @@ export default { ...@@ -13,9 +13,8 @@ export default {
13 mounted() { 13 mounted() {
14 this.loading = true; 14 this.loading = true;
15 removeToken(); 15 removeToken();
16 - if (this.$route.query.token && this.$route.query.uid) { 16 + if (this.$route.query.token) {
17 setToken(decodeURI(this.$route.query.token)); 17 setToken(decodeURI(this.$route.query.token));
18 - setUid(decodeURI(this.$route.query.uid));
19 this.$router.push({ name: "WaybillInquiry" }); 18 this.$router.push({ name: "WaybillInquiry" });
20 this.loading = false; 19 this.loading = false;
21 // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} }) 20 // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} })
......