From 5df31795e5530fd30b707f177e94910e5642cfc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= Date: Tue, 21 Mar 2023 14:39:54 +0800 Subject: [PATCH] =?UTF-8?q?[fix]:=20=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E5=87=BA=E7=8E=B0=E7=9A=84warning=EF=BC=9B?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2::v-deep=E4=B8=BA:deep()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/components/login-by-account.vue | 232 ++++----- src/components/login-by-code.vue | 345 +++++++------- src/i18n/i18n.js | 2 +- src/main.js | 11 +- src/page/login/index.vue | 250 +++++----- src/page/main/config/accessRule/index.vue | 6 +- src/page/main/config/loginPage/index.vue | 4 +- src/page/main/config/preference/index.vue | 2 +- .../develop/systemApproval/approval/index.vue | 6 +- src/page/main/log/userAccount/index.vue | 6 +- src/page/main/log/userBehavior/index.vue | 6 +- src/page/registe/index.vue | 446 ++++++++---------- src/router/index.js | 2 +- 14 files changed, 618 insertions(+), 701 deletions(-) diff --git a/src/App.vue b/src/App.vue index 9315340..8da352a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,6 +5,7 @@
- - 登 录 + 登 录 + + + + 还没有账号？前往注册  + - - - 还没有账号？前往注册  - -
记住密码 - 忘记密码？ + 忘记密码？
@@ -74,8 +55,8 @@ import { generateRoutes } from "../router/index"; import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue"; import { ElMessage } from "element-plus"; import axios from "@/request/http.js"; -import { Encrypt } from "@/services/secret.js" -import { useStore } from "vuex" +import { Encrypt } from "@/services/secret.js"; +import { useStore } from "vuex"; const state = reactive({ loginForm: { @@ -93,127 +74,121 @@ const state = reactive({ identifyCode: "", hidePassword: true, rememberPassword: false, -}) +}); -const store = useStore() +const store = useStore(); -const loginFormRef = ref(null) +const loginFormRef = ref(null); const loginAction = () => { - if (state.rememberPassword) { - let userinfo = window.btoa( - encodeURI(`${state.loginForm.userid},${state.loginForm.password}`) - ); - setCookie("userinfo", userinfo); - } else { - clearCookie("userinfo"); - } + if (state.rememberPassword) { + let userinfo = window.btoa(encodeURI(`${state.loginForm.userid},${state.loginForm.password}`)); + setCookie("userinfo", userinfo); + } else { + clearCookie("userinfo"); + } - loginFormRef.value.validate((valid) => { - if (valid) { - axios.get( - `/apaas/system/v5/user/verifyCaptcha?id=${state.imgId}&value=${state.loginForm.yzm}` - ) - .then((res) => { - if (res.data.code == 200) { - login(); - } else { - ElMessage.error(res.data.data); - } - }); + loginFormRef.value.validate((valid) => { + if (valid) { + axios.get(`/apaas/system/v5/user/verifyCaptcha?id=${state.imgId}&value=${state.loginForm.yzm}`).then((res) => { + if (res.data.code == 200) { + login(); + } else { + ElMessage.error(res.data.data); } }); } + }); +}; const login = () => { - axios.post(`/apaas/system/v5/user/login`, { - system_account: state.loginForm.userid, - password: Encrypt(state.loginForm.password) - }) - .then(({ data }) => { - if (data.code == 200) { - getUser(); - } else { - getImg(true); - ElMessage.error(data.data); - } - }) - .catch((error) => { - console.log(error); - }); - } + axios + .post(`/apaas/system/v5/user/login`, { + system_account: state.loginForm.userid, + password: Encrypt(state.loginForm.password), + }) + .then(({ data }) => { + if (data.code == 200) { + getUser(); + } else { + getImg(true); + ElMessage.error(data.data); + } + }) + .catch((error) => { + console.log(error); + }); +}; const getUserInfo = () => { - return axios.get(`/apaas/system/v5/user/getUserInfo`); - } + return axios.get(`/apaas/system/v5/user/getUserInfo`); +}; const getMenu = (search) => { - return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`); - } + return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`); +}; const getUser = () => { - Promise.all([getUserInfo(), getMenu('dadb2d3f-e263-48d1-9389-42acb9ea49f8')]).then((res) => { - if (res[0].data.code == 200 && res[1].data.code == 200) { - let data = res[1].data.data&&res[1].data.data[0].children || []; - store.commit("setUserInfo", res[0].data.data); - // if (res.data.data.userType == 1) { - //超管 - store.commit("setMenu", data); + Promise.all([getUserInfo(), getMenu("dadb2d3f-e263-48d1-9389-42acb9ea49f8")]).then((res) => { + if (res[0].data.code == 200 && res[1].data.code == 200) { + let data = (res[1].data.data && res[1].data.data[0].children) || []; + store.commit("setUserInfo", res[0].data.data); + // if (res.data.data.userType == 1) { + //超管 + store.commit("setMenu", data); - menu.menuToRouter(data); + menu.menuToRouter(data); - store.commit("setRoute", data); + store.commit("setRoute", data); - //存储菜单对象信息 - let menuObj = {}; - getMenuObj(data, "", menuObj); - store.commit("setMenuObj", menuObj); - // } - generateRoutes(); - // this.$router.push("/"); - //跳转到工作台页面 - window.location.href = "/apaas/portal/ui/#/"; - } - }); + //存储菜单对象信息 + let menuObj = {}; + getMenuObj(data, "", menuObj); + store.commit("setMenuObj", menuObj); + // } + generateRoutes(); + // this.$router.push("/"); + //跳转到工作台页面 + window.location.href = "/apaas/portal/ui/#/"; } + }); +}; const getMenuObj = (menu, parentRowPath, menuObj) => { - menu.forEach((e, idx) => { - e.rowPath = parentRowPath + "." + idx; - menuObj[e.path] = e; - if (e.children && e.children.length) { - getMenuObj(e.children, e.rowPath, menuObj); - } - }); + menu.forEach((e, idx) => { + e.rowPath = parentRowPath + "." + idx; + menuObj[e.path] = e; + if (e.children && e.children.length) { + getMenuObj(e.children, e.rowPath, menuObj); } + }); +}; const getImg = (clearInput = false) => { - axios.get(`/apaas/system/v5/user/getCaptcha??width=240&height=32`) - .then((res) => { - if (res.data.code == 200) { - state.imgId = res.data.data.id; - state.imgSrc = res.data.data.captcha; - } - }); - if (clearInput) { - state.loginForm.yzm = ""; - } + axios.get(`/apaas/system/v5/user/getCaptcha??width=240&height=32`).then((res) => { + if (res.data.code == 200) { + state.imgId = res.data.data.id; + state.imgSrc = res.data.data.captcha; } + }); + if (clearInput) { + state.loginForm.yzm = ""; + } +}; onBeforeMount(() => { - getImg(); - if (getCookie("userinfo")) { - let userinfo = window.atob(decodeURI(getCookie("userinfo"))).split(","); + getImg(); + if (getCookie("userinfo")) { + let userinfo = window.atob(decodeURI(getCookie("userinfo"))).split(","); - state.loginForm.userid = userinfo[0]; - state.loginForm.password = userinfo[1]; - state.checked = true; + state.loginForm.userid = userinfo[0]; + state.loginForm.password = userinfo[1]; + state.checked = true; - state.rememberPassword = true; - } else { - state.checked = false; - } -}) -const {loginForm, steploginFormRules, imgId, imgSrc, identifyCode, hidePassword, rememberPassword} = toRefs(state) + state.rememberPassword = true; + } else { + state.checked = false; + } +}); +const { loginForm, steploginFormRules, imgId, imgSrc, identifyCode, hidePassword, rememberPassword } = toRefs(state); diff --git a/src/components/login-by-code.vue b/src/components/login-by-code.vue index 683c675..e11d0b9 100644 --- a/src/components/login-by-code.vue +++ b/src/components/login-by-code.vue @@ -1,199 +1,198 @@ - - - - - \ No newline at end of file +} + diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index 18f9d85..b90bd0e 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -1,4 +1,4 @@ -import {createI18n} from 'vue-i18n' +import {createI18n} from 'vue-i18n/index' import lang from './index' const i18n = createI18n({ diff --git a/src/main.js b/src/main.js index 441c476..4e0779d 100644 --- a/src/main.js +++ b/src/main.js @@ -27,7 +27,7 @@ import i18n from "./i18n/i18n.js"; import axios from "./request/http.js"; const createVue = createApp(App); -createVue.use(ElementPlus, { locale }); +// createVue.use(ElementPlus, { locale }); function getMsgAppid() { axios.get(`/apaas/system/v5/message/account`).then((res) => { @@ -96,12 +96,11 @@ Promise.all([getUser(), getMenu("dadb2d3f-e263-48d1-9389-42acb9ea49f8")]) // } } generateRoutes(); - - createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui); - createVue.mount("#app"); }) - .catch(() => { - createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui); + .catch((e) => { + console.error(e) + }).finally(() => { + createVue.use(ElementPlus, { locale }).use(store).use(router).use(i18n).use(bgui); createVue.mount("#app"); }); diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 943bde9..906a237 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -1,149 +1,135 @@ - - - - - \ No newline at end of file +} + diff --git a/src/page/main/config/accessRule/index.vue b/src/page/main/config/accessRule/index.vue index 921a85a..214ade9 100644 --- a/src/page/main/config/accessRule/index.vue +++ b/src/page/main/config/accessRule/index.vue @@ -445,10 +445,10 @@ onBeforeMount(() => { border-radius: 3px; border: solid 1px #b0bee8; } - ::v-deep td { + :deep() td { padding: 9px 0 !important; } - ::v-deep .el-switch { + :deep() .el-switch { height: 20px; width: 44px; .el-switch__core { @@ -460,7 +460,7 @@ onBeforeMount(() => { } } - ::v-deep .dialog_box_detail { + :deep() .dialog_box_detail { .el-dialog__body { padding: 0 0 18px 0; height: 580px; diff --git a/src/page/main/config/loginPage/index.vue b/src/page/main/config/loginPage/index.vue index 425ce15..2638196 100644 --- a/src/page/main/config/loginPage/index.vue +++ b/src/page/main/config/loginPage/index.vue @@ -97,7 +97,7 @@ const rules = reactive({}); padding-left: 24px; .el-form { width: 60%; - ::v-deep .el-form-item { + :deep() .el-form-item { &:nth-of-type(1) { .el-upload--picture-card { width: 120px; @@ -112,7 +112,7 @@ const rules = reactive({}); } } } - ::v-deep .gap-title { + :deep() .gap-title { font-size: 16px; color: #202531; } diff --git a/src/page/main/config/preference/index.vue b/src/page/main/config/preference/index.vue index a3f52a5..4de8293 100644 --- a/src/page/main/config/preference/index.vue +++ b/src/page/main/config/preference/index.vue @@ -254,7 +254,7 @@ const save = () => {}; .authorizeForm, .secureForm, .registerForm { - ::v-deep .el-form-item { + :deep() .el-form-item { margin-bottom: 24px; width: 750px; font-size: 14px; diff --git a/src/page/main/develop/systemApproval/approval/index.vue b/src/page/main/develop/systemApproval/approval/index.vue index 1db8a42..3434aa8 100644 --- a/src/page/main/develop/systemApproval/approval/index.vue +++ b/src/page/main/develop/systemApproval/approval/index.vue @@ -248,11 +248,11 @@ const save = () => { } .approveForm { padding: 24px 24px 0 24px; - ::v-deep .el-form-item { + :deep() .el-form-item { margin-bottom: 24px; } - ::v-deep .el-form-item__label, - ::v-deep .el-radio__label { + :deep() .el-form-item__label, + :deep() .el-radio__label { color: var(--el-text-color-primary); } } diff --git a/src/page/main/log/userAccount/index.vue b/src/page/main/log/userAccount/index.vue index f99ed73..2f7e157 100644 --- a/src/page/main/log/userAccount/index.vue +++ b/src/page/main/log/userAccount/index.vue @@ -482,10 +482,10 @@ onBeforeMount(() => { border-radius: 3px; border: solid 1px #b0bee8; } - ::v-deep td { + :deep() td { padding: 9px 0 !important; } - ::v-deep .el-switch { + :deep() .el-switch { height: 20px; width: 44px; .el-switch__core { @@ -497,7 +497,7 @@ onBeforeMount(() => { } } - ::v-deep .dialog_box_detail { + :deep() .dialog_box_detail { .el-dialog__body { padding: 0 0 18px 0; height: 580px; diff --git a/src/page/main/log/userBehavior/index.vue b/src/page/main/log/userBehavior/index.vue index f99ed73..2f7e157 100644 --- a/src/page/main/log/userBehavior/index.vue +++ b/src/page/main/log/userBehavior/index.vue @@ -482,10 +482,10 @@ onBeforeMount(() => { border-radius: 3px; border: solid 1px #b0bee8; } - ::v-deep td { + :deep() td { padding: 9px 0 !important; } - ::v-deep .el-switch { + :deep() .el-switch { height: 20px; width: 44px; .el-switch__core { @@ -497,7 +497,7 @@ onBeforeMount(() => { } } - ::v-deep .dialog_box_detail { + :deep() .dialog_box_detail { .el-dialog__body { padding: 0 0 18px 0; height: 580px; diff --git a/src/page/registe/index.vue b/src/page/registe/index.vue index 9da7e1d..dd9bfd1 100644 --- a/src/page/registe/index.vue +++ b/src/page/registe/index.vue @@ -3,22 +3,16 @@
登录 - 注册 + 注册
-
业务系统注册
-
注册信息提示审批后即可登录
+
业务系统注册
+
注册信息提示审批后即可登录
- +
基础信息
@@ -35,73 +29,44 @@ style="width: 100%" /> - + - + + :value="item.id" /> - + - + - + - +
- - +
- - {{countDown > 0 ? countDown + '秒后再次获取' : '发送验证码'}} - + + {{ countDown > 0 ? countDown + "秒后再次获取" : "发送验证码" }} +
-
+
+ show-word-limit />
@@ -122,41 +86,31 @@
- + - +
- +
- 返回登录页 - 注册 + 返回登录页 + 注册
- - - - + style="width: 90%"> + + +
- \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 5cbf1dc..72fa4c4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -69,7 +69,7 @@ router.beforeEach((to, from, next) => { // 检查to.path是否存在于免登陆白名单 if (inWhiteList(to.path)) { - next(); + return next(); } else { // 判断是否已经登录，未登录则重定向到首页或其他页面（通过query传参记录原来的路径） // 根据配置判断是否跳转第三方登录，跳转第三方登录则不跳login -- 2.26.0