From 6c92130d9691a9fddf28d6745d8f96273d093827 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期日, 04 二月 2024 16:26:39 +0800
Subject: [PATCH] 1
---
src/utils/NameConf.js | 19 ++++++
src/components/login.vue | 92 +++++++++++++++---------------
src/router/index.js | 46 +++++++-------
3 files changed, 88 insertions(+), 69 deletions(-)
diff --git a/src/components/login.vue b/src/components/login.vue
index e79bdb0..89f38a5 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -139,54 +139,54 @@
},
// 璐﹀彿瀵嗙爜鐧诲綍
submitForm(formName) {
- this.$router.push("/index");
- // this.$refs[formName].validate((valid) => {
- // if (valid) {
- // const loading = this.$loading({
- // lock: true,
- // text: "Loading",
- // spinner: "el-icon-loading",
- // background: "rgba(0, 0, 0, 0.7)",
- // });
+ // this.$router.push("/index");
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ const loading = this.$loading({
+ lock: true,
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
- // login({
- // username: this.loginForm.loginname,
- // password: this.loginForm.password,
- // })
- // .then((res) => {
- // loading.close();
- // if (res.code !== 200) {
- // this.$message.error(res.msg);
- // } else {
- // let tokenData = res.token;
- // let times = new Date().getTime();
- // window.localStorage.setItem("TokenTime", times);
- // window.localStorage.setItem("TokenKey", tokenData);
- // this.$router.push("/index");
- // }
- // })
- // .catch((error) => {
- // //缃戠粶瓒呮椂寮傚父澶勭悊
- // loading.close();
- // if (
- // error.code === "ECONNABORTED" ||
- // error.message === "Network Error" ||
- // error.message.includes("timeout")
- // ) {
- // this.$message.error("璇锋眰瓒呮椂锛岃绋嶅悗閲嶈瘯");
- // }
- // return Promise.resolve(error.response);
- // // reject(error);
- // });
+ login({
+ username: this.loginForm.loginname,
+ password: this.loginForm.password,
+ })
+ .then((res) => {
+ loading.close();
+ if (res.code !== 200) {
+ this.$message.error(res.msg);
+ } else {
+ let tokenData = res.token;
+ let times = new Date().getTime();
+ window.localStorage.setItem("TokenTime", times);
+ window.localStorage.setItem("TokenKey", tokenData);
+ this.$router.push("/index");
+ }
+ })
+ .catch((error) => {
+ //缃戠粶瓒呮椂寮傚父澶勭悊
+ loading.close();
+ if (
+ error.code === "ECONNABORTED" ||
+ error.message === "Network Error" ||
+ error.message.includes("timeout")
+ ) {
+ this.$message.error("璇锋眰瓒呮椂锛岃绋嶅悗閲嶈瘯");
+ }
+ return Promise.resolve(error.response);
+ // reject(error);
+ });
- // // //濡傛灉鐧诲綍澶辫触锛岄渶瑕佸埛鏂伴獙璇佺爜鐨�
- // // this.$refs.refresh.createdCode();
- // // this.validCode = ""; //娓呯┖楠岃瘉鐮佽緭鍏ユ鐨勫唴瀹�
- // } else {
- // // console.log("error submit!!");
- // return false;
- // }
- // });
+ // //濡傛灉鐧诲綍澶辫触锛岄渶瑕佸埛鏂伴獙璇佺爜鐨�
+ // this.$refs.refresh.createdCode();
+ // this.validCode = ""; //娓呯┖楠岃瘉鐮佽緭鍏ユ鐨勫唴瀹�
+ } else {
+ // console.log("error submit!!");
+ return false;
+ }
+ });
},
// CA鍏嶅瘑鐧诲綍
passCAFree() {
diff --git a/src/router/index.js b/src/router/index.js
index 2e84787..50d4797 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,34 +30,34 @@
];
const router = new Router({
mode: "history",
- // base: '/SW',//娴嬭瘯鐗� 鎵撳寘鏃惰В寮�
+ base: '/SW',//娴嬭瘯鐗� 鎵撳寘鏃惰В寮�
// base: '/YZXNCS',//姝ｅ紡鐗� 鎵撳寘鏃惰В寮�
routes,
});
router.beforeEach((to, from, next) => {
- next();
+ // next();
// 鍘荤櫥褰曢〉锛岀洿鎺ヨ烦杞�
- // if (to.path === "/login") {
- // next();
- // } else {
- // //鍘籭ndex锛屽垽鏂璽oken
- // let token = localStorage.getItem("TokenKey");
- // if (token === null || token === "") { // 娌℃湁token,鍘荤櫥闄嗛〉
- // next("/login");
- // } else {
- // // 鏈塼oken,鍒ゆ柇瓒呮椂
- // let TokenTime = window.localStorage.getItem("TokenTime");
- // let nowTime = new Date().getTime()
- // if (nowTime - TokenTime > 60 * 60 * 1000) { // 瓒呰繃60鍒嗛挓锛屽幓鐧婚檰椤�
- // next("/login");
- // localStorage.removeItem("TokenKey");
- // localStorage.removeItem("TokenTime");
- // } else {
- // // 鍘籭ndex锛屾湁token锛屾病杩囨湡锛岃繘鍏ョ郴缁�
- // next();
- // }
- // }
- // }
+ if (to.path === "/login") {
+ next();
+ } else {
+ //鍘籭ndex锛屽垽鏂璽oken
+ let token = localStorage.getItem("TokenKey");
+ if (token === null || token === "") { // 娌℃湁token,鍘荤櫥闄嗛〉
+ next("/login");
+ } else {
+ // 鏈塼oken,鍒ゆ柇瓒呮椂
+ let TokenTime = window.localStorage.getItem("TokenTime");
+ let nowTime = new Date().getTime()
+ if (nowTime - TokenTime > 60 * 60 * 1000) { // 瓒呰繃60鍒嗛挓锛屽幓鐧婚檰椤�
+ next("/login");
+ localStorage.removeItem("TokenKey");
+ localStorage.removeItem("TokenTime");
+ } else {
+ // 鍘籭ndex锛屾湁token锛屾病杩囨湡锛岃繘鍏ョ郴缁�
+ next();
+ }
+ }
+ }
})
export default router;
diff --git a/src/utils/NameConf.js b/src/utils/NameConf.js
new file mode 100644
index 0000000..b4082a9
--- /dev/null
+++ b/src/utils/NameConf.js
@@ -0,0 +1,19 @@
+const LayerField = {
+ Id: 0,
+ ID: 0,
+ 浜曠紪鍙�: 0,
+ 浜曠被鍨�: 0,
+ 琛屾斂鍖哄煙缂�: 0,
+ 浣嶇疆: 0,
+ 鏍囨澶�: 0,
+
+
+ 閮ㄤ欢鍚嶇О: 0,
+ 閮ㄤ欢缂栫爜: 0,
+ 瀹夎鍦板潃: 0,
+ 鎵�灞炲尯鍩�: 0,
+ 璁惧鏉冨睘: 0,
+ 缁忓害: 0,
+ 绾害: 0
+}
+export default LayerField
\ No newline at end of file
--
Gitblit v1.9.3