diff --git a/src/api/modules/jxjview.ts b/src/api/modules/jxjview.ts index 3790fc4..cbbc090 100644 --- a/src/api/modules/jxjview.ts +++ b/src/api/modules/jxjview.ts @@ -186,3 +186,8 @@ export const addProject = (params: FormData) => { export const addCompany = (params: FormData) => { return http.post(BASEURL + `/ent/enterprise/add`, params); }; + +// 获取系统名称配置 +export const systemNameConfig = (params: FormData) => { + return http.post(BASEURL + `/xmgl/systemConfig/queryByKey`, params); +}; diff --git a/src/assets/images/login/bg.png b/src/assets/images/login/bg.png new file mode 100644 index 0000000..ef57b16 Binary files /dev/null and b/src/assets/images/login/bg.png differ diff --git a/src/components/layoutTop/index.vue b/src/components/layoutTop/index.vue index 1fbe65a..5bbb28a 100644 --- a/src/components/layoutTop/index.vue +++ b/src/components/layoutTop/index.vue @@ -5,7 +5,7 @@ diff --git a/src/layouts/LayoutClassic/index.vue b/src/layouts/LayoutClassic/index.vue index 0d5bbb6..dc3e33f 100644 --- a/src/layouts/LayoutClassic/index.vue +++ b/src/layouts/LayoutClassic/index.vue @@ -6,7 +6,7 @@ diff --git a/src/stores/index.ts b/src/stores/index.ts index 1980bb0..04c2668 100644 --- a/src/stores/index.ts +++ b/src/stores/index.ts @@ -29,6 +29,7 @@ export const GlobalStore = defineStore({ // language language: "", path: null, + systemNameConfig: "", // 系统名称配置 // themeConfig themeConfig: { // 当前页面是否全屏 diff --git a/src/stores/interface/index.ts b/src/stores/interface/index.ts index 6b9152d..8ade063 100644 --- a/src/stores/interface/index.ts +++ b/src/stores/interface/index.ts @@ -15,6 +15,7 @@ export interface GlobalState { openDropdown: boolean | null; path: string | null; isManager: string | null; + systemNameConfig: string | null; // 系统名称配置 } /* themeConfigProp */ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index a7ce7f5..a2f85e4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -6,7 +6,7 @@ diff --git a/src/views/login/CompanyLogon/index.vue b/src/views/login/CompanyLogon/index.vue index f0d0d08..101a370 100644 --- a/src/views/login/CompanyLogon/index.vue +++ b/src/views/login/CompanyLogon/index.vue @@ -4,7 +4,7 @@ @@ -36,6 +36,8 @@ import { addCompany } from "@/api/modules/jxjview"; import type { RuleFormData } from "./basic-form.vue"; import type { EnterpriseMains } from "./entrepreneur.vue"; import { ElMessage } from "element-plus"; +import { GlobalStore } from "@/stores"; +const globalStore = GlobalStore(); const router = useRouter(); const datas = reactive(values); diff --git a/src/views/login/ProJectForm/index.vue b/src/views/login/ProJectForm/index.vue index 520c56d..f15aca9 100644 --- a/src/views/login/ProJectForm/index.vue +++ b/src/views/login/ProJectForm/index.vue @@ -5,7 +5,7 @@
- 乳山工程建筑管理服务平台 + {{ globalStore.systemNameConfig }}
| @@ -77,6 +77,8 @@ import AMap from "@/components/AMap/AMap.vue"; import { ElMessage, FormInstance, ElForm, FormRules } from "element-plus"; // import router from "@/routers"; import { LOGIN_URL } from "@/config/config"; +import { GlobalStore } from "@/stores"; +const globalStore = GlobalStore(); const router = useRouter(); diff --git a/src/views/login/index.scss b/src/views/login/index.scss index 4a9abdc..00329ad 100644 --- a/src/views/login/index.scss +++ b/src/views/login/index.scss @@ -1,122 +1,112 @@ -.flx-center { - display: flex; - flex-direction: column; - align-items: flex-start; -} -.login-container { - height: 100%; - min-height: 550px; - background: url("@/assets/images/login/bglogin_rushan.png") center center no-repeat; - background-size: 100% 65%; - .login-title { - color: #2a314b; - font-weight: 600; - font-size: 22px; - > span { - margin-left: 30px; - } - } - .login-box { - position: relative; - box-sizing: border-box; - display: flex; - align-items: center; - justify-content: flex-end; - width: 96%; - height: 75%; - - // background-color: hsl(0deg 0% 100% / 80%); - border-radius: 10px; - .dark { - position: absolute; - top: 13px; - right: 18px; - } - .login-left { - width: 515px; - height: 473px; - - // margin: 0 10px 0 0; - background: url("@/assets/images/login/Group 2585.jpg") repeat-x 0 0; - background-size: 100%; - img { - // width: 100%; - // height: 100%; - margin: 126px 0 65px 190px; - } - span { - margin: 0 0 65px 88px; - font-size: 40px; - font-weight: 600; - color: white; - } - } - .login-form { - width: 420px; - height: 377px; - padding: 50px 40px 45px; - background-color: #ffffff; - margin-right: 120px; - // border-radius: 10px; - box-shadow: 2px 3px 7px rgb(0 0 0 / 20%); - .login-logo { - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 45px; - .login-icon { - width: 60px; - height: 52px; - } - .logo-text { - padding: 0 0 0 25px; - margin: 0; - font-size: 32px; - font-weight: 500; - color: #333333; - white-space: nowrap; - } - } - .el-form-item { - margin-bottom: 40px; - } - .login-btn { - display: flex; - - // justify-content: space-between; - justify-content: center; - width: 100%; - margin-top: 40px; - white-space: nowrap; - .el-button { - width: 280px; - height: 42px; - color: #ffffff; - background-color: #2246b4; - } - } - .logon { - display: flex; - - // text-align: center; - margin-top: 48px; - margin-left: 29%; - } - } - } -} -.form { - padding: 0 17%; -} - -@media screen and (max-width: 1250px) { - .login-left { - display: none; - } -} - -@media screen and (max-width: 600px) { - .login-form { - width: 97% !important; - } -} +.login-container { + height: 100%; + min-height: 550px; + background: url("@/assets/images/login/loginBackground.jpg") center center no-repeat; + background-color: #eeeeee; + background-size: 100% 100%; + background-size: cover; + .login-box { + position: relative; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: center; + width: 96%; + height: 94%; + padding: 0 50px; + + // background-color: hsl(0deg 0% 100% / 80%); + border-radius: 10px; + .dark { + position: absolute; + top: 13px; + right: 18px; + } + .login-left { + width: 515px; + height: 473px; + + // margin: 0 10px 0 0; + background: url("@/assets/images/login/Group 2585.jpg") repeat-x 0 0; + background-size: 100%; + img { + // width: 100%; + // height: 100%; + margin: 126px 0 65px 190px; + } + div { + text-align: center; + font-size: 40px; + font-weight: 600; + color: white; + } + } + .login-form { + width: 420px; + height: 377px; + padding: 50px 40px 45px; + background-color: #ffffff; + + // border-radius: 10px; + box-shadow: 2px 3px 7px rgb(0 0 0 / 20%); + .login-logo { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 45px; + .login-icon { + width: 60px; + height: 52px; + } + .logo-text { + padding: 0 0 0 25px; + margin: 0; + font-size: 32px; + font-weight: 500; + color: #333333; + white-space: nowrap; + } + } + .el-form-item { + margin-bottom: 40px; + } + .login-btn { + display: flex; + + // justify-content: space-between; + justify-content: center; + width: 100%; + margin-top: 40px; + white-space: nowrap; + .el-button { + width: 280px; + height: 42px; + color: #ffffff; + background-color: #2246b4; + } + } + .logon { + display: flex; + + // text-align: center; + margin-top: 48px; + margin-left: 29%; + } + } + } +} +.form { + padding: 0 17%; +} + +@media screen and (max-width: 1250px) { + .login-left { + display: none; + } +} + +@media screen and (max-width: 600px) { + .login-form { + width: 97% !important; + } +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b1d2f28..526902a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,31 +1,38 @@ - - - - - + + + + + diff --git a/src/views/login/index1.scss b/src/views/login/index1.scss new file mode 100644 index 0000000..cf9423a --- /dev/null +++ b/src/views/login/index1.scss @@ -0,0 +1,144 @@ +.flx-center { + display: flex; + flex-direction: column; + align-items: flex-start; +} +.login-container { + height: 100%; + min-height: 550px; + position: relative; + &::before { + content: ""; + position: absolute; + top: 0px; + bottom: 0px; + width: 100%; + height: 100%; + background: url("@/assets/images/login/bg.png") center center no-repeat; + background-size: 100% 100%; + z-index: 1; + } + &::after { + content: ""; + position: absolute; + top: 0px; + bottom: 0px; + width: 100%; + height: 100%; + background-image: linear-gradient(152deg, #2c90ff, #3f2da3); + background-color: rgba(255, 255, 255, 0.54); + } + .login-title { + color: #2a314b; + font-weight: 600; + font-size: 22px; + position: relative; + z-index: 1; + > span { + margin-left: 30px; + } + } + .login-box { + position: relative; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: flex-end; + width: 96%; + height: 75%; + z-index: 1; + // background-color: hsl(0deg 0% 100% / 80%); + border-radius: 10px; + .dark { + position: absolute; + top: 13px; + right: 18px; + } + .login-left { + width: 515px; + height: 473px; + + // margin: 0 10px 0 0; + background: url("@/assets/images/login/Group 2585.jpg") repeat-x 0 0; + background-size: 100%; + img { + // width: 100%; + // height: 100%; + margin: 126px 0 65px 190px; + } + span { + margin: 0 0 65px 88px; + font-size: 40px; + font-weight: 600; + color: white; + } + } + .login-form { + width: 420px; + height: 377px; + padding: 50px 40px 45px; + background-color: #ffffff; + margin-right: 120px; + // border-radius: 10px; + box-shadow: 2px 3px 7px rgb(0 0 0 / 20%); + .login-logo { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 45px; + .login-icon { + width: 60px; + height: 52px; + } + .logo-text { + padding: 0 0 0 25px; + margin: 0; + font-size: 32px; + font-weight: 500; + color: #333333; + white-space: nowrap; + } + } + .el-form-item { + margin-bottom: 40px; + } + .login-btn { + display: flex; + + // justify-content: space-between; + justify-content: center; + width: 100%; + margin-top: 40px; + white-space: nowrap; + .el-button { + width: 280px; + height: 42px; + color: #ffffff; + background-color: #2246b4; + } + } + .logon { + display: flex; + + // text-align: center; + margin-top: 48px; + margin-left: 29%; + } + } + } +} +.form { + padding: 0 17%; +} + +@media screen and (max-width: 1250px) { + .login-left { + display: none; + } +} + +@media screen and (max-width: 600px) { + .login-form { + width: 97% !important; + } +} diff --git a/src/views/login/index1.vue b/src/views/login/index1.vue new file mode 100644 index 0000000..e2b1ade --- /dev/null +++ b/src/views/login/index1.vue @@ -0,0 +1,33 @@ + + + + +