- {{ userName }}
+ {{ account }}
+
+ 修改密码
+
登出
@@ -30,11 +33,9 @@
diff --git a/src/permission.js b/src/permission.js
index 49a3dfb75568d6d757aa342620d8ec2a4a5a5095..68d9469d24d62d2299c47f426e78cad645c643d2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -18,14 +18,14 @@ router.beforeEach(async(to, from, next) => {
// document.title = getPageTitle(to.meta.title)
// determine whether the user has logged in
- const hasToken = getToken()
+ const hasToken = store.getters.token
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
next({ path: '/' })
NProgress.done()
} else {
- const hasGetUserInfo = store.getters.name
+ const hasGetUserInfo = store.getters.account
if (hasGetUserInfo) {
next()
} else {
diff --git a/src/store/getters.js b/src/store/getters.js
index 1c30831a2a0f3250856ba231a37d313de2f98d5f..f75052307c5793dcf04398a99616df3e536160bc 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -3,9 +3,10 @@ const getters = {
device: state => state.app.device,
token: state => state.user.token,
avatar: state => state.user.avatar,
- name: state => state.user.name,
+ account: state => state.user.account,
certificate_Id: state => state.user.certificate_Id,
step: state => state.user.step,
- loading: state => state.user.loading
+ loading: state => state.user.loading,
+ accountStatus: state => state.user.accountStatus,
}
export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 33315d3af949f7a5a52002bb91313989ae4b711d..94816ce5b99534121a70b19992d2920f8e709fdd 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -9,12 +9,13 @@ import { resetRouter } from "@/router";
const getDefaultState = () => {
return {
- token: getToken(),
- name: "",
+ token: getLocalStore("token") || "",
+ account: getLocalStore("account") || "",
avatar: "",
certificate_Id: getLocalStore("certificate_Id") || "",
step: getLocalStore("step") || 0,
loading: getLocalStore("loading") || 0,
+ accountStatus: getLocalStore("accountStatus") || 0,
};
};
@@ -26,9 +27,15 @@ const mutations = {
},
SET_TOKEN: (state, token) => {
state.token = token;
+ setLocalStore("token", token);
},
- SET_NAME: (state, name) => {
- state.name = name;
+ REMOVE_TOKEN: (state) => {
+ state.token = "";
+ removeLocalStore("token");
+ },
+ SET_ACCOUNT: (state, account) => {
+ state.account = account;
+ setLocalStore("account", account);
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar;
@@ -37,7 +44,7 @@ const mutations = {
state.certificate_Id = certificate_Id;
setLocalStore("certificate_Id", certificate_Id);
},
- REMOVE_CERTIFICATE_ID: (state, certificate_Id) => {
+ REMOVE_CERTIFICATE_ID: (state) => {
state.certificate_Id = "";
removeLocalStore("certificate_Id");
},
@@ -49,20 +56,23 @@ const mutations = {
state.loading = loading;
setLocalStore("loading", loading);
},
+ SET_ACCOUNTSTATUS: (state, accountStatus) => {
+ state.accountStatus = accountStatus;
+ setLocalStore("accountStatus", accountStatus);
+ },
};
const actions = {
// user login
login({ commit }, userInfo) {
- const { name, pwd } = userInfo;
+ const { account, accountPwd } = userInfo;
return new Promise((resolve, reject) => {
- login({ name: name.trim(), pwd: pwd })
+ login({ account: account.trim(), accountPwd: accountPwd })
.then((response) => {
const { result } = response;
- commit("SET_NAME", "admin");
- setUserName("admin");
- commit("SET_TOKEN", "token");
- setToken("token");
+ commit("SET_ACCOUNT", result.account);
+ commit("SET_TOKEN", result.token);
+ commit("SET_ACCOUNTSTATUS", result.accountStatus);
resolve();
})
.catch((error) => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 8af6114b9012f9a126c39c8893e25f0b3d0d56ac..a57215609696172a5a071e03d7827d7dada53d12 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,7 +1,7 @@
import axios from "axios";
import { MessageBox, Message } from "element-ui";
import store from "@/store";
-import { getToken } from "@/utils/auth";
+import router from "../router";
// create an axios instance
const service = axios.create({
@@ -19,7 +19,7 @@ service.interceptors.request.use(
// let each request carry token
// ['X-Token'] is a custom headers key
// please modify it according to the actual situation
- config.headers["X-Token"] = getToken();
+ config.headers["AuthorizationToken"] = "Token " + store.getters.token;
}
return config;
},
@@ -56,23 +56,26 @@ service.interceptors.response.use(
});
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
- if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+ if (res.code === 10003105 || res.code === 10003106 || res.code === 50014) {
// to re-login
- MessageBox.confirm(
- "You have been logged out, you can cancel to stay on this page, or log in again",
- "Confirm logout",
- {
- confirmButtonText: "Re-Login",
- cancelButtonText: "Cancel",
- type: "warning",
- }
- ).then(() => {
- store.dispatch("user/resetToken").then(() => {
- location.reload();
- });
- });
+ store.commit("user/REMOVE_TOKEN");
+ router.push({ path: "/login" });
+ // MessageBox.confirm(
+ // "You have been logged out, you can cancel to stay on this page, or log in again",
+ // "Confirm logout",
+ // {
+ // confirmButtonText: "Re-Login",
+ // cancelButtonText: "Cancel",
+ // type: "warning",
+ // }
+ // ).then(() => {
+ // store.dispatch("user/resetToken").then(() => {
+ // location.reload();
+ // });
+ // });
}
- return Promise.reject(new Error(res.message || "Error"));
+ return res;
+ // return Promise.reject(new Error(res.msg || "Error"));
} else {
return res;
}
diff --git a/src/views/ConfigManange/index.vue b/src/views/ConfigManange/index.vue
index 6db982d1c23d4bf9f28ade85a3d30881bbc70969..e29dfcc059253b074c325ce408d5da70c100b07f 100644
--- a/src/views/ConfigManange/index.vue
+++ b/src/views/ConfigManange/index.vue
@@ -108,12 +108,6 @@ export default {
if (res.code === 0) {
this.tableData = res.result;
this.total = res.totalCount;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -159,12 +153,6 @@ export default {
if (res.code === 0) {
this.previewCertPicData = res.result;
this.previewPicShow = true;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -176,12 +164,6 @@ export default {
if (res.code === 0) {
this.previewCertQueryData = res.result;
this.previewQueryShow = true;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -193,12 +175,6 @@ export default {
if (res.code === 0) {
this.previewCertResultData = res.result;
this.previewResultShow = true;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -224,12 +200,6 @@ export default {
duration: 2000,
});
this.getCertListData();
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -245,12 +215,6 @@ export default {
if (res.code === 0) {
this.SET_CERTIFICATE_ID(res.result);
this.$router.push("/addConfigManange");
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/addConfigManange/certificateConfigImg.vue b/src/views/addConfigManange/certificateConfigImg.vue
index 4c81f4a1d6d58bedd95aa139d1000f0197667bad..63a7b0af8330c005fa26e5740b6e3fc8df50080d 100644
--- a/src/views/addConfigManange/certificateConfigImg.vue
+++ b/src/views/addConfigManange/certificateConfigImg.vue
@@ -315,12 +315,6 @@ export default {
if (res.code === 0) {
this.previewCertPicData = res.result;
this.previewPicShow = true;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -352,12 +346,6 @@ export default {
this.configData = res.result;
this.configData.fields[0].delete = "no";
this.previewAble = false;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -375,9 +363,8 @@ export default {
message: "证书图片配置成功！",
});
this.saveSuccessData = res.result;
- // localStorage.setItem("certificate_Id", res.result.id);
this.SET_CERTIFICATE_ID(res.result.id);
- localStorage.setItem("saveSuccessData", JSON.stringify(res.result));
+ // localStorage.setItem("saveSuccessData", JSON.stringify(res.result));
this.previewAble = false;
//下一步
if (jump) {
@@ -385,11 +372,6 @@ export default {
}
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/addConfigManange/certificateConfigImport.vue b/src/views/addConfigManange/certificateConfigImport.vue
index 632d585b0553bcf909e7226edca4d58a5019c813..91fb1226d3b14ebe09cbdcfff73300306d10f18c 100644
--- a/src/views/addConfigManange/certificateConfigImport.vue
+++ b/src/views/addConfigManange/certificateConfigImport.vue
@@ -69,11 +69,6 @@ export default {
this.$router.push("/createCertList");
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/addConfigManange/certificateConfigQuery.vue b/src/views/addConfigManange/certificateConfigQuery.vue
index 1ecbd664b0f5b18edef14effe1001eb936d9036d..47fcc016aa1d06e86490356dfb676e80f34633b8 100644
--- a/src/views/addConfigManange/certificateConfigQuery.vue
+++ b/src/views/addConfigManange/certificateConfigQuery.vue
@@ -121,12 +121,6 @@ export default {
return false;
}
this.queryData = res.result;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -177,11 +171,6 @@ export default {
}
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/addConfigManange/certificateConfigResult.vue b/src/views/addConfigManange/certificateConfigResult.vue
index ee894cab57a6251b4a50aa533273daee87751511..8ee93c270c3945515c4cb2125dbf20068f9360c2 100644
--- a/src/views/addConfigManange/certificateConfigResult.vue
+++ b/src/views/addConfigManange/certificateConfigResult.vue
@@ -120,12 +120,6 @@ export default {
// res.result.enableFields.forEach((item, index) => {
// this.fields.push(JSON.stringify(item));
// });
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -174,11 +168,6 @@ export default {
}
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/createCertList/index.vue b/src/views/createCertList/index.vue
index f3ec421b489e89e0c962e1ec02043d5000831d33..80fbfd3b905e6d0b6bac722ca9884467df5fdebf 100644
--- a/src/views/createCertList/index.vue
+++ b/src/views/createCertList/index.vue
@@ -191,17 +191,10 @@ export default {
if (res.code === 0) {
this.previewCertPicData = res.result;
this.previewPicShow = true;
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
downLoad(row) {
- debugger;
const reqData = {
id: row.id,
};
@@ -214,12 +207,6 @@ export default {
document.body.appendChild(downloadElement);
downloadElement.click(); //触发点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -235,12 +222,6 @@ export default {
if (res.code === 0) {
this.downLoadData = res.result;
this.downloadImages();
- } else {
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -294,11 +275,6 @@ export default {
this.getCertListData();
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
});
@@ -331,11 +307,6 @@ export default {
this.getCertListData();
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -352,11 +323,6 @@ export default {
this.getCertListData();
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
@@ -386,11 +352,6 @@ export default {
this.getCertListData();
} else {
this.SET_LOADING(false);
- this.$message({
- message: "系统错误",
- type: "error",
- duration: 2000,
- });
}
});
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 90c1ca78370d6a2aa3a22203f24aca0e8431bce4..f6faebf0bb70e5a961af48b954c7ae8d30f21941 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -2,7 +2,6 @@
-
登录
@@ -26,26 +25,25 @@
- 登录
-