From 9bc14ab7c65543561fd94dc2ea23a92c3ad0e24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
=?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Fri, 21 Mar 2025 10:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E6=89=A7?=
=?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=8F=8A=E8=83=8C=E6=99=AF=E5=9B=BE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.prod | 2 +-
src/views/Login/Login.vue | 59 ++++++++++++++++-----------------
src/views/enterprises/index.vue | 2 +-
3 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/.env.prod b/.env.prod
index 35f39a1..670eb7b 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,7 +4,7 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径
-VITE_BASE_URL='https://hb.jzce.com'
+VITE_BASE_URL='https://yxsthj.cn/'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
VITE_UPLOAD_TYPE=server
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 51b255f..792b528 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -7,15 +7,11 @@
<div
:class="`${prefixCls}__left flex-1 relative p-30px lt-xl:hidden overflow-x-hidden overflow-y-auto`"
>
-
<!-- 左边的背景图 + 欢迎语 -->
- <div class="h-[calc(100%-50px)] flex items-center justify-center">
-
-
- </div>
+ <div class="h-[calc(100%-50px)] flex items-center justify-center"> </div>
</div>
<div
- class="relative flex-1 bg-#fff bg-opacity-90 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px overflow-x-hidden overflow-y-auto"
+ class="relative flex-1 bg-#fff bg-opacity-90 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px overflow-x-hidden overflow-y-auto"
>
<!-- 右上角的主题、语言选择 -->
<!-- <div
@@ -29,15 +25,21 @@
</div>
</div> -->
<!-- 右边的登录界面 -->
- <Transition appear enter-active-class="animate__animated animate__bounceInRight" class="rightLogin">
+ <Transition
+ appear
+ enter-active-class="animate__animated animate__bounceInRight"
+ class="rightLogin"
+ >
<div
class="m-auto h-[calc(100%-60px)] w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
>
- <!-- 账号登录 -->
- <LoginForm v-if="isIpAccess" class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
- <!-- 二维码登录 -->
- <QrCodeForm v-else class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
-
+ <!-- 账号登录 -->
+ <LoginForm
+ v-if="isIpAccess"
+ class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)"
+ />
+ <!-- 二维码登录 -->
+ <QrCodeForm v-else class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
</div>
</Transition>
</div>
@@ -45,42 +47,37 @@
</div>
</template>
<script lang="ts" setup>
-import { underlineToHump } from '@/utils'
import { useDesign } from '@/hooks/web/useDesign'
-import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
-import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
-import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue, ForgetPasswordForm } from './components'
+import {
+ LoginForm,
+ QrCodeForm,
+} from './components'
defineOptions({ name: 'Login' })
const isIpAccess = ref(false)
onMounted(() => {
- const hostname = window.location.hostname
- if(hostname == 'localhost'){
- isIpAccess.value = true;
- }
- else{
- isIpAccess.value = /^(\d{1,3}\.){3}\d{1,3}$/.test(hostname)
- }
+ const hostname = window.location.hostname
+ if (hostname == 'localhost') {
+ isIpAccess.value = true
+ } else {
+ isIpAccess.value = /^(\d{1,3}\.){3}\d{1,3}$/.test(hostname)
+ }
// 判断是否为IP地址访问
})
-const { t } = useI18n()
-const appStore = useAppStore()
const { getPrefixCls } = useDesign()
const prefixCls = getPrefixCls('login')
</script>
<style lang="scss" scoped>
-
-.loginBgCls{
+.loginBgCls {
background-image: url('@/assets/imgs/screen/login-left.jpg');
background-size: cover;
-
+
background-repeat: no-repeat;
}
-.rightLogin{
+.rightLogin {
transition: all 1s;
}
@@ -116,4 +113,4 @@ $prefix-cls: #{$namespace}-login;
background-color: var(--login-bg-color);
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue
index ef7106c..bdb6b79 100644
--- a/src/views/enterprises/index.vue
+++ b/src/views/enterprises/index.vue
@@ -111,7 +111,7 @@
</el-table-column>
<el-table-column label="执法人员" width="200">
<template #default="scope">
- {{`${scope.row.inviterName} | ${scope.row.inviterName}`}}
+ {{`${scope.row.inviterName} | ${scope.row.inviterNameDept}`}}
</template>
</el-table-column>
<el-table-column