jinhui.wang

接口增加,参数修改

...@@ -33,7 +33,7 @@ export function getUserByAccNo(data) { ...@@ -33,7 +33,7 @@ export function getUserByAccNo(data) {
33 // 退出 33 // 退出
34 export function logout() { 34 export function logout() {
35 return request({ 35 return request({
36 - url: "/icleartw/sysUser/logout", 36 + url: "/manager-server/auth/logout",
37 method: "post", 37 method: "post",
38 }); 38 });
39 } 39 }
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
27 <div class="userName register"> 27 <div class="userName register">
28 {{ userData.userName != null ? userData.userName : "" }} 28 {{ userData.userName != null ? userData.userName : "" }}
29 <el-divider direction="vertical"></el-divider> 29 <el-divider direction="vertical"></el-divider>
30 - <span>{{ userData.type }}</span> 30 + <span>{{ userData.typeName }}</span>
31 - <el-divider direction="vertical"></el-divider> 31 + <!-- <el-divider direction="vertical"></el-divider> -->
32 </div> 32 </div>
33 </div> 33 </div>
34 <div class="user-container" v-else> 34 <div class="user-container" v-else>
......
...@@ -9,7 +9,6 @@ const getters = { ...@@ -9,7 +9,6 @@ const getters = {
9 token: (state) => state.user.token, 9 token: (state) => state.user.token,
10 avatar: (state) => state.user.avatar, 10 avatar: (state) => state.user.avatar,
11 name: (state) => state.user.name, 11 name: (state) => state.user.name,
12 - id: (state) => state.user.id,
13 activePortName: (state) => state.user.activePortName, 12 activePortName: (state) => state.user.activePortName,
14 portName: (state) => state.user.portName, 13 portName: (state) => state.user.portName,
15 introduction: (state) => state.user.introduction, 14 introduction: (state) => state.user.introduction,
......
...@@ -7,10 +7,10 @@ const user = { ...@@ -7,10 +7,10 @@ const user = {
7 token: getToken(), 7 token: getToken(),
8 userData: {}, 8 userData: {},
9 name: "", 9 name: "",
10 - id: "",
11 avatar: "", 10 avatar: "",
12 activePortName: "", 11 activePortName: "",
13 appLoading: false, 12 appLoading: false,
13 + tableHeader: [],
14 }, 14 },
15 15
16 mutations: { 16 mutations: {
...@@ -23,9 +23,6 @@ const user = { ...@@ -23,9 +23,6 @@ const user = {
23 SET_NAME: (state, name) => { 23 SET_NAME: (state, name) => {
24 state.name = name; 24 state.name = name;
25 }, 25 },
26 - SET_ID: (state, id) => {
27 - state.id = id;
28 - },
29 SET_AVATAR: (state, avatar) => { 26 SET_AVATAR: (state, avatar) => {
30 state.avatar = avatar; 27 state.avatar = avatar;
31 }, 28 },
......
...@@ -740,7 +740,7 @@ export default { ...@@ -740,7 +740,7 @@ export default {
740 this.$store 740 this.$store
741 .dispatch("Login", this.loginForm) 741 .dispatch("Login", this.loginForm)
742 .then(() => { 742 .then(() => {
743 - this.$router.push({ name: "declarationInput" }).catch(() => { 743 + this.$router.push({ name: "WaybillInquiry" }).catch(() => {
744 this.loading = false; 744 this.loading = false;
745 }); 745 });
746 }) 746 })
...@@ -836,7 +836,7 @@ export default { ...@@ -836,7 +836,7 @@ export default {
836 dangerouslyUseHTMLString: true, 836 dangerouslyUseHTMLString: true,
837 type: "success", 837 type: "success",
838 }).then(() => { 838 }).then(() => {
839 - location.href = "/IcTw/#/login"; 839 + location.href = "/ImpPer/#/login";
840 this.loginType = "login"; 840 this.loginType = "login";
841 }); 841 });
842 } else { 842 } else {
......
...@@ -243,6 +243,7 @@ export default { ...@@ -243,6 +243,7 @@ export default {
243 fclInit().then((res) => { 243 fclInit().then((res) => {
244 if (res.code == 200) { 244 if (res.code == 200) {
245 if (this.appEnv == "development" || this.appEnv == "staging") { 245 if (this.appEnv == "development" || this.appEnv == "staging") {
246 + localStorage.setItem("impPreHost", location.origin);
246 this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${ 247 this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${
247 location.origin 248 location.origin
248 }/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`; 249 }/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`;
......