Skip to content

S
so-manage-ui
Commit 5df31795 authored by 赵伟庚's avatar 赵伟庚
Browse files
Options

[fix]: 部分代码格式化；修复控制台出现的warning；替换::v-deep为:deep()

parent 5bcb7b08
Expand all Show whitespace changes
Inline Side-by-side
Showing with 618 additions and 701 deletions
src/App.vue
View file @ 5df31795
......@@ -5,6 +5,7 @@
<div class="container" :class="menuShow ? '' : 'full_screen'" v-if="pageShow">
<!-- <bg-nav :highlightParentRule="highlightParentRule" :title="nowParent.menuName" width="208px" :list="nowParent.children" v-show="navShow" class="con-nav" /> -->
<bg-nav
v-if="nowParent.children"
:highlightParentRule="highlightParentRule"
width="208px"
:list="nowParent.children"
......
src/components/login-by-account.vue
View file @ 5df31795
<template>
<div class="login-by-account">
<el-form
ref="loginFormRef"
label-position="top"
:model="loginForm"
:rules="steploginFormRules"
>
<el-form ref="loginFormRef" label-position="top" :model="loginForm" :rules="steploginFormRules">
<el-form-item prop="userid">
<el-input
v-model="loginForm.userid"
placeholder="请输入账号"
@keyup.enter.native="loginAction()"
/>
<el-input v-model="loginForm.userid" placeholder="请输入账号" @keyup.enter.native="loginAction()" />
</el-form-item>
<el-form-item prop="password">
<el-input
:type="hidePassword ? 'password' : 'text'"
v-model="loginForm.password"
placeholder="请输入密码"
@keyup.enter.native="loginAction()"
>
@keyup.enter.native="loginAction()">
<span
slot="suffix"
:title="hidePassword ? '显示密码' : '隐藏密码'"
:class="hidePassword ? 'hide-password' : 'show-password'"
@click="hidePassword = !hidePassword"
style="cursor: pointer"
></span>
style="cursor: pointer"></span>
</el-input>
</el-form-item>
<el-form-item prop="yzm">
......@@ -35,27 +24,19 @@
v-model="loginForm.yzm"
placeholder="请输入验证码"
@keyup.enter.native="loginAction()"
style="width: 240px"
/>
style="width: 240px" />
<div class="yzm_img">
<img
title="看不清？换一张"
:src="imgSrc"
@click="getImg()"
style="width: 100%"
/>
<img title="看不清？换一张" :src="imgSrc" @click="getImg()" style="width: 100%" />
</div>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loginAction()" style="width: 100%">
登 录
</el-button>
<el-button type="primary" @click="loginAction()" style="width: 100%"> 登 录 </el-button>
</el-form-item>
<el-form-item style="margin-top: 24px;">
<el-form-item style="margin-top: 24px">
<el-button class="register_btn" @click.prevent="$emit('register')" style="width: 100%">
还没有账号？前往注册&emsp; <bg-icon style="font-size: 12px;margin-right: 8px" icon="#bg-ic-arrow-right"></bg-icon>
还没有账号？前往注册&emsp;
<bg-icon style="font-size: 12px; margin-right: 8px" icon="#bg-ic-arrow-right"></bg-icon>
</el-button>
</el-form-item>
<div class="regist_bottom">
......@@ -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,17 +74,15 @@ 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}`)
);
let userinfo = window.btoa(encodeURI(`${state.loginForm.userid},${state.loginForm.password}`));
setCookie("userinfo", userinfo);
} else {
clearCookie("userinfo");
......@@ -111,10 +90,7 @@ const loginAction = () => {
loginFormRef.value.validate((valid) => {
if (valid) {
axios.get(
`/apaas/system/v5/user/verifyCaptcha?id=${state.imgId}&value=${state.loginForm.yzm}`
)
.then((res) => {
axios.get(`/apaas/system/v5/user/verifyCaptcha?id=${state.imgId}&value=${state.loginForm.yzm}`).then((res) => {
if (res.data.code == 200) {
login();
} else {
......@@ -123,11 +99,12 @@ const loginAction = () => {
});
}
});
}
};
const login = () => {
axios.post(`/apaas/system/v5/user/login`, {
axios
.post(`/apaas/system/v5/user/login`, {
system_account: state.loginForm.userid,
password: Encrypt(state.loginForm.password)
password: Encrypt(state.loginForm.password),
})
.then(({ data }) => {
if (data.code == 200) {
......@@ -140,17 +117,17 @@ const login = () => {
.catch((error) => {
console.log(error);
});
}
};
const getUserInfo = () => {
return axios.get(`/apaas/system/v5/user/getUserInfo`);
}
};
const getMenu = (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) => {
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 || [];
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) {
//超管
......@@ -171,7 +148,7 @@ const getUser = () => {
window.location.href = "/apaas/portal/ui/#/";
}
});
}
};
const getMenuObj = (menu, parentRowPath, menuObj) => {
menu.forEach((e, idx) => {
e.rowPath = parentRowPath + "." + idx;
......@@ -180,10 +157,9 @@ const getMenuObj = (menu, parentRowPath, menuObj) => {
getMenuObj(e.children, e.rowPath, menuObj);
}
});
}
};
const getImg = (clearInput = false) => {
axios.get(`/apaas/system/v5/user/getCaptcha??width=240&height=32`)
.then((res) => {
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;
......@@ -192,7 +168,7 @@ const getImg = (clearInput = false) => {
if (clearInput) {
state.loginForm.yzm = "";
}
}
};
onBeforeMount(() => {
getImg();
if (getCookie("userinfo")) {
......@@ -206,13 +182,12 @@ onBeforeMount(() => {
} else {
state.checked = false;
}
})
const {loginForm, steploginFormRules, imgId, imgSrc, identifyCode, hidePassword, rememberPassword} = toRefs(state)
});
const { loginForm, steploginFormRules, imgId, imgSrc, identifyCode, hidePassword, rememberPassword } = toRefs(state);
</script>
<style lang="scss" scoped>
.login-by-account {
.msg-code {
display: flex;
justify-content: space-between;
......@@ -233,5 +208,4 @@ const {loginForm, steploginFormRules, imgId, imgSrc, identifyCode, hidePassword,
line-height: 34px;
}
}
</style>
src/components/login-by-code.vue
View file @ 5df31795
......@@ -6,8 +6,7 @@
v-model="loginForm.mobile"
autofocus="autofocus"
placeholder="请输入手机号码"
@keyup.enter.native="loginAction()"
/>
@keyup.enter.native="loginAction()" />
</el-form-item>
<el-form-item prop="code">
<div class="msg-code">
......@@ -15,13 +14,15 @@
v-model="loginForm.code"
placeholder="请输入验证码"
@keyup.enter.native="loginAction()"
style="width: 280px"
>
style="width: 280px">
</el-input>
<div class="yzm_img">
<el-button type="primary" @click.prevent="getMsgCode()" style="width: 100%;height: 34px;">
{{countDown > 0 ? countDown + '秒后再次获取' : '发送验证码'}}
<el-button
type="primary"
:disabled="countDown > 0"
@click.prevent="getMsgCode()"
style="width: 100%; height: 34px">
{{ countDown > 0 ? countDown + "秒后再次获取" : "发送验证码" }}
</el-button>
<!-- <a class="input-append disabled" v-if="false && countDown > 0">
{{ countDown }}秒后再次获取
......@@ -31,16 +32,14 @@
</a> -->
</div>
</div>
</el-form-item>
<el-form-item style="margin-top: 54px;">
<el-button type="primary" @click.prevent="loginAction()" style="width: 100%">
登 录
</el-button>
<el-form-item style="margin-top: 54px">
<el-button type="primary" @click.prevent="loginAction()" style="width: 100%"> 登 录 </el-button>
</el-form-item>
<el-form-item style="margin-top: 24px;">
<el-form-item style="margin-top: 24px">
<el-button class="register_btn" @click.prevent="$emit('register')" style="width: 100%">
还没有账号？前往注册&emsp; <bg-icon style="font-size: 12px; margin-right: 8px" icon="#bg-ic-arrow-right"></bg-icon>
还没有账号？前往注册&emsp;
<bg-icon style="font-size: 12px; margin-right: 8px" icon="#bg-ic-arrow-right"></bg-icon>
</el-button>
</el-form-item>
<div>
......@@ -48,14 +47,14 @@
</div>
</el-form>
</div>
</template>
</template>
<script setup>
import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
import { ElMessage } from "element-plus";
import axios from "@/request/http.js";
<script setup>
import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
import { ElMessage } from "element-plus";
import axios from "@/request/http.js";
const validatePhone = (rule, value, callback) => {
const validatePhone = (rule, value, callback) => {
const reg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
setTimeout(() => {
......@@ -65,9 +64,9 @@
callback();
}
});
};
};
const state = reactive({
const state = reactive({
loginForm: {
mobile: "",
code: "",
......@@ -81,24 +80,24 @@
},
countDown: 0,
countDownTimer: null,
})
});
const loginFormRef = ref(null)
const loginFormRef = ref(null);
const getMsgCode = () => {
const getMsgCode = () => {
loginFormRef.value.validateField("mobile", (valid) => {
if (valid) {
axios.post('/apaas/system/v5/sms/verifyCode',{phone: state.loginForm.mobile}).then(({ data }) => {
axios.post("/apaas/system/v5/sms/verifyCode", { phone: state.loginForm.mobile }).then(({ data }) => {
if (data.code == 200) {
countDownAction();
}else {
} else {
ElMessage.error(data.data);
}
});
}
});
};// 获取验证码
const countDownAction = () => {
}; // 获取验证码
const countDownAction = () => {
state.countDown = 60;
if (state.countDownTimer) {
......@@ -112,11 +111,12 @@
clearInterval(state.countDownTimer);
}
}, 1000);
}
const loginAction = () => {
};
const loginAction = () => {
loginFormRef.value.validate((valid) => {
if (valid) {
axios.post(`/apaas/system/v5/user/phone/login`, {
axios
.post(`/apaas/system/v5/user/phone/login`, {
phone: state.loginForm.mobile,
code: state.loginForm.code,
})
......@@ -132,18 +132,18 @@
});
}
});
} // 短信验证码登录
}; // 短信验证码登录
const getUserInfo = () => {
const getUserInfo = () => {
return axios.get(`/apaas/system/v5/user/getUserInfo`);
}
const getMenu = (search) => {
};
const getMenu = (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) => {
};
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 || [];
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) {
//超管
......@@ -164,13 +164,13 @@
window.location.href = "/apaas/portal/ui/#/";
}
});
}
};
const { loginForm, loginFormRules, countDown, countDownTimer } = toRefs(state);
</script>
const { loginForm, loginFormRules, countDown, countDownTimer } = toRefs(state);
</script>
<style lang="scss" scoped>
.login-by-code {
<style lang="scss" scoped>
.login-by-code {
.msg-code {
display: flex;
justify-content: space-between;
......@@ -194,6 +194,5 @@
}
}
}
}
</style>
\ No newline at end of file
}
</style>
src/i18n/i18n.js
View file @ 5df31795
import {createI18n} from 'vue-i18n'
import {createI18n} from 'vue-i18n/index'
import lang from './index'
const i18n = createI18n({
......
src/main.js
View file @ 5df31795
......@@ -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");
});
......
src/page/login/index.vue
View file @ 5df31795
......@@ -10,63 +10,52 @@
<bg-tabs
class="login-tab"
v-model="loginTab"
style="min-height: 450px;width: 480px"
v-if="pageType === 'login'"
>
style="min-height: 450px; width: 480px"
v-if="pageType === 'login'">
<bg-tab label="账号密码登录" name="account">
<LoginByAccount @register="switchPageType('account')" @password="password"/>
<LoginByAccount @register="switchPageType('account')" @password="password" />
</bg-tab>
<bg-tab label="验证码登录" name="register">
<LoginByCode @register="switchPageType('register')" @password="password"/>
<LoginByCode @register="switchPageType('register')" @password="password" />
</bg-tab>
</bg-tabs>
</div>
</div>
<!-- v-if="pageType !== 'register'" -->
<div class="bg-msg">
<p>
Copyright © 比格大数据, All Rights Reserved.
</p>
<p>
ICP备案序号：晋ICP备12000773号 | 晋公网安备 14010602060307号
</p>
<p>
法律声明 | 隐私政策
</p>
<p>Copyright © 比格大数据, All Rights Reserved.</p>
<p>ICP备案序号：晋ICP备12000773号 | 晋公网安备 14010602060307号</p>
<p>法律声明 | 隐私政策</p>
</div>
</div>
</template>
<script setup>
import LoginByAccount from "@/components/login-by-account.vue";
import LoginByCode from "@/components/login-by-code.vue";
// import RegisterPersonalUser from "@/components/register-personal-user.vue";
// import RegisterFrimUser from "@/components/register-firm-user.vue";
// import RegisterOrgUser from "@/components/register-org-user.vue";
// import RegisterSuccess from "@/components/register-success.vue";
import { ref, computed, onMounted } from "vue";
import { useRouter } from "vue-router";
const router = useRouter();
const pageType = ref('login')
const loginTab = ref('account')
const registerTab = ref('registerTab')
const switchPageType = (type) => {
</template>
<script setup>
import LoginByAccount from "@/components/login-by-account.vue";
import LoginByCode from "@/components/login-by-code.vue";
// import RegisterPersonalUser from "@/components/register-personal-user.vue";
// import RegisterFrimUser from "@/components/register-firm-user.vue";
// import RegisterOrgUser from "@/components/register-org-user.vue";
// import RegisterSuccess from "@/components/register-success.vue";
import { ref, computed, onMounted } from "vue";
import { useRouter } from "vue-router";
const router = useRouter();
const pageType = ref("login");
const loginTab = ref("account");
const registerTab = ref("registerTab");
const switchPageType = (type) => {
// pageType.value = type
router.push('/registe')
}
const password = () => {
router.push('/password')
}
</script>
<style lang="scss" scoped>
.login-container {
router.push("/registe");
};
const password = () => {
router.push("/password");
};
</script>
<style lang="scss" scoped>
.login-container {
width: 100vw;
height: calc(100vh - 56px);
background-image: url("@/assets/imgs/bg_zhuce.png");
......@@ -106,7 +95,7 @@
display: flex;
justify-content: center;
align-items: center;
.logo{
.logo {
width: 450px;
}
......@@ -118,7 +107,6 @@
}
> .bg-content {
}
}
> .bg-warning {
......@@ -142,8 +130,6 @@
> p {
padding: 8px 0;
}
}
}
</style>
\ No newline at end of file
}
</style>
src/page/main/config/accessRule/index.vue
View file @ 5df31795
......@@ -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;
......
src/page/main/config/loginPage/index.vue
View file @ 5df31795
......@@ -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;
}
......
src/page/main/config/preference/index.vue
View file @ 5df31795
......@@ -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;
......
src/page/main/develop/systemApproval/approval/index.vue
View file @ 5df31795
......@@ -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);
}
}
......
src/page/main/log/userAccount/index.vue
View file @ 5df31795
......@@ -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;
......
src/page/main/log/userBehavior/index.vue
View file @ 5df31795
......@@ -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;
......
src/page/registe/index.vue
View file @ 5df31795
This diff is collapsed.
src/router/index.js
View file @ 5df31795
......@@ -69,7 +69,7 @@ router.beforeEach((to, from, next) => {
// 检查to.path是否存在于免登陆白名单
if (inWhiteList(to.path)) {
next();
return next();
} else {
// 判断是否已经登录，未登录则重定向到首页或其他页面（通过query传参记录原来的路径）
// 根据配置判断是否跳转第三方登录，跳转第三方登录则不跳login
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment