From 87e9af27f879efc32da1c0de47229e524bdfe9cc Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 1 Aug 2023 15:39:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |  6 ++--
 .../login/{index1.scss => index-hc.scss}      |  0
 src/views/login/{index1.vue => index-hc.vue}  | 23 ++++++++------
 src/views/login/index.scss                    | 30 ++++++++++++-------
 src/views/login/index.vue                     | 23 ++++++--------
 5 files changed, 46 insertions(+), 36 deletions(-)
 rename src/views/login/{index1.scss => index-hc.scss} (100%)
 rename src/views/login/{index1.vue => index-hc.vue} (56%)

diff --git a/index.html b/index.html
index b3ee265..ee32053 100644
--- a/index.html
+++ b/index.html
@@ -101,11 +101,11 @@
 			}
 		</script>
 		<script type="module" src="/src/main.ts"></script>
-		<script src="/jquery-1.12.4.min.js"></script>
+		<script src="./public/jquery-1.12.4.min.js"></script>
 		<!-- 用于前端与插件交互 -->
-		<script src="/jsencrypt.min.js"></script>
+		<script src="./public/jsencrypt.min.js"></script>
 		<!-- 用于RSA加密 -->
-		<script src="/jsWebControl-1.0.0.min.js"></script>
+		<script src="./public/jsWebControl-1.0.0.min.js"></script>
 		<!-- 用于RSA加密 -->
 		<script
 			type="text/javascript"
diff --git a/src/views/login/index1.scss b/src/views/login/index-hc.scss
similarity index 100%
rename from src/views/login/index1.scss
rename to src/views/login/index-hc.scss
diff --git a/src/views/login/index1.vue b/src/views/login/index-hc.vue
similarity index 56%
rename from src/views/login/index1.vue
rename to src/views/login/index-hc.vue
index e2b1ade..526902a 100644
--- a/src/views/login/index1.vue
+++ b/src/views/login/index-hc.vue
@@ -1,15 +1,12 @@
 <template>
 	<div class="login-container flx-center">
-		<div class="login-title">
-			<span>{{ globalStore.systemNameConfig }}</span>
-		</div>
 		<div class="login-box">
-			<!-- <SwitchDark class="dark" /> -->
-			<!-- <div class="login-left">
-				<img src="@/assets/images/login_left.png" alt="login" />
+			<div class="login-left">
+				<!-- <img src="@/assets/images/login_left.png" alt="login" /> -->
 				<img src="@/assets/images/login/computerIcon.png" alt="" /><br />
-				<span>数字化政务监管平台</span>
-			</div> -->
+				<!-- 数字化政务监管平台 -->
+				<div>{{ globalStore.systemNameConfig }}</div>
+			</div>
 			<div class="login-form">
 				<div class="login-logo">
 					<!-- <img class="login-icon" src="@/assets/images/logo.svg" alt="" /> -->
@@ -22,10 +19,18 @@
 </template>
 
 <script setup lang="ts" name="login">
-import SwitchDark from "@/components/SwitchDark/index.vue";
 import LoginForm from "./components/LoginForm.vue";
+import { onMounted } from "vue";
+import { systemNameConfig } from "@/api/modules/jxjview";
 import { GlobalStore } from "@/stores";
 const globalStore = GlobalStore();
+onMounted(async () => {
+	const res = await systemNameConfig({ configKey: "system_name" });
+	console.log(res);
+	if (res && res.result) {
+		globalStore.systemNameConfig = res.result.configValue;
+	}
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 00329ad..74e7092 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -1,19 +1,29 @@
+.flx-center {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+}
 .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;
+	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: center;
+		justify-content: flex-end;
 		width: 96%;
-		height: 94%;
-		padding: 0 50px;
+		height: 75%;
 
 		// background-color: hsl(0deg 0% 100% / 80%);
 		border-radius: 10px;
@@ -34,8 +44,8 @@
 				// height: 100%;
 				margin: 126px 0 65px 190px;
 			}
-			div {
-				text-align: center;
+			span {
+				margin: 0 0 65px 88px;
 				font-size: 40px;
 				font-weight: 600;
 				color: white;
@@ -46,7 +56,7 @@
 			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 {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 526902a..e2b1ade 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,12 +1,15 @@
 <template>
 	<div class="login-container flx-center">
+		<div class="login-title">
+			<span>{{ globalStore.systemNameConfig }}</span>
+		</div>
 		<div class="login-box">
-			<div class="login-left">
-				<!-- <img src="@/assets/images/login_left.png" alt="login" /> -->
+			<!-- <SwitchDark class="dark" /> -->
+			<!-- <div class="login-left">
+				<img src="@/assets/images/login_left.png" alt="login" />
 				<img src="@/assets/images/login/computerIcon.png" alt="" /><br />
-				<!-- 数字化政务监管平台 -->
-				<div>{{ globalStore.systemNameConfig }}</div>
-			</div>
+				<span>数字化政务监管平台</span>
+			</div> -->
 			<div class="login-form">
 				<div class="login-logo">
 					<!-- <img class="login-icon" src="@/assets/images/logo.svg" alt="" /> -->
@@ -19,18 +22,10 @@
 </template>
 
 <script setup lang="ts" name="login">
+import SwitchDark from "@/components/SwitchDark/index.vue";
 import LoginForm from "./components/LoginForm.vue";
-import { onMounted } from "vue";
-import { systemNameConfig } from "@/api/modules/jxjview";
 import { GlobalStore } from "@/stores";
 const globalStore = GlobalStore();
-onMounted(async () => {
-	const res = await systemNameConfig({ configKey: "system_name" });
-	console.log(res);
-	if (res && res.result) {
-		globalStore.systemNameConfig = res.result.configValue;
-	}
-});
 </script>
 
 <style scoped lang="scss">