DESKTOP-CRQ4N2U\jintian 2 år sedan
förälder
incheckning
0b905db73d

+ 2 - 2
.env.development

@@ -5,6 +5,6 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'development'
 
 # 金田基础框架/开发环境
-VITE_API_URL = 'http://218.59.194.82:13181/'
+VITE_API_URL = 'http://218.59.194.82:13182/'
 
-# 后台地址: http://218.59.194.82:13190/sdjn-admin/
+# 后台管理地址: http://218.59.194.82:13190/sdjt-admin/

+ 3 - 1
.env.production

@@ -5,7 +5,9 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13181/'
+VITE_API_URL = 'http://218.59.194.82:13182/'
+
+# 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 1 - 1
index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>济南市南部山区三维平台</title>
+		<title>金田CIM三维基础平台</title>
 		<style>
 			#app {
 				height: 100vh;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
src/assets/dataFile/map_xzqh_zj.json


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 1
src/assets/dataFile/xz.json


BIN
src/assets/images/header/header-1.png


BIN
src/assets/images/header/header-1.webp


BIN
src/assets/images/login/login-title.webp


+ 25 - 17
src/views/Login/Login.vue

@@ -38,15 +38,13 @@
 			</div>
 			<div class="loginbox-input">
 				<span class='iconfont icon-mima1'></span>
-				<el-input v-model="loginForm.password" type="password" clearable show-password placeholder="请输入密码"
-					@keyup.enter="onLoginClick" />
+				<el-input v-model="loginForm.password" type="password" clearable show-password placeholder="请输入密码" @keyup.enter="onLoginClick" />
 			</div>
 			<div class="loginbox-checkbox">
 				<span>
 					<!-- <input id="sfjzzh" type="checkbox" title="记住账号" :checked="loginForm.remember" @click="remeberPerson"
 						@keyup.enter="onLoginClick" /> -->
-					<el-switch change="remeberPerson" @keyup.enter="onLoginClick" width="40rem" size="default"
-						v-model="loginForm.remember"></el-switch>
+					<el-switch change="remeberPerson" @keyup.enter="onLoginClick" width="40rem" size="default" v-model="loginForm.remember"></el-switch>
 					记住账号密码
 				</span>
 			</div>
@@ -167,27 +165,37 @@
 </script>
 
 <style lang="scss" scoped>
+	$fontColor: #fff;
+	$fullsize: calc(100% - 0rem);
+	$header-title: url(@/assets/images/login/login-title.webp) 0rem no-repeat;
+	$header-bg-color: linear-gradient(100deg,
+		rgb(16, 96, 210, 0.2) 30%,
+		rgb(16, 106, 250, 0.1) 70%);
+
 	::v-deep .el-input__wrapper {
 		padding-left: 56rem !important;
 	}
+
 	::v-deep .is-checked .el-switch__core .el-switch__action {
 		margin-left: calc(-1rem - 14rem);
 	}
+
 	el-switch {
 		margin: 3rem 0rem;
 		width: 36rem !important;
 	}
+
 	::v-deep .el-switch__core .el-switch__action {
 		width: 16rem !important;
 		height: 16rem !important;
 	}
-	
-	
+
+
 	::v-deep .el-switch__core .el-switch__action {
 		top: 1rem;
 	}
-	
-	
+
+
 	::v-deep .el-switch__core {
 		width: 40rem !important;
 		height: 20rem !important;
@@ -240,10 +248,10 @@
 
 	/* 页面顶部标题栏样式 */
 	.logoinTop {
-		width: calc(100% - 0rem);
+		width: $fullsize;
 		height: 70rem;
 		line-height: 70rem;
-		background: url(@/assets/images/login/login-title.webp) 0rem no-repeat, linear-gradient(100deg, rgba(16, 96, 210, .2) 30%, rgba(16, 106, 250, .1) 70%);
+		background: $header-title, $header-bg-color;
 		background-size: 510rem 70rem, 100% 70rem;
 		background-repeat: no-repeat;
 		user-select: none;
@@ -254,7 +262,7 @@
 	/* 页面底部样式 */
 	.loginBottom {
 		position: absolute;
-		width: calc(100% - 0rem);
+		width: $fullsize;
 		height: 110rem;
 		bottom: -40rem;
 		background: linear-gradient(100deg, rgba(16, 96, 210, .1) 20%, rgba(16, 106, 250, .1) 40%);
@@ -262,7 +270,7 @@
 		background-repeat: no-repeat;
 		font-size: 13rem;
 		text-align: center;
-		color: #ffffff;
+		color: $fontColor;
 		overflow: hidden;
 		user-select: none;
 		padding: 10rem 0rem;
@@ -298,7 +306,7 @@
 		line-height: 70rem;
 		font-size: 30rem;
 		font-weight: 600;
-		color: #ffffff;
+		color: $fontColor;
 		text-align: center;
 		margin-top: 30rem;
 		padding: 0rem;
@@ -327,12 +335,12 @@
 
 	/* 记住账号复选框样式 */
 	.loginbox-checkbox {
-		width: calc(100% - 0rem);
+		width: $fullsize;
 		height: 40rem;
 		line-height: 40rem;
 		/* 字间距 */
 		letter-spacing: 2rem;
-		color: #ffffff;
+		color: $fontColor;
 		font-size: 14rem;
 	}
 
@@ -355,7 +363,7 @@
 
 	/* 登录按钮样式 */
 	.loginbox-btn div {
-		width: calc(100% - 0rem);
+		width: $fullsize;
 		height: 40rem;
 		line-height: 40rem;
 		background-color: rgba(0, 153, 240, 0.8);
@@ -391,7 +399,7 @@
 
 	//后置图标颜色
 	::v-deep .el-icon svg {
-		color: #ffffff;
+		color: $fontColor;
 		height: 10rem;
 		width: 10rem;
 	}

+ 0 - 38
src/views/test/test.vue

@@ -1,38 +0,0 @@
-<!-- test页面内嵌测试-->
-<script setup>
-</script>
-
-<template>
-	<view class="main">
-		<iframe src="http://218.59.194.82:14083/" scrolling="auto" frameborder="0" class="trend-container2"
-			id="iframe"></iframe>
-		<!-- <jt-popup :height="height" :title="title">
-			<h1>测试插槽</h1>
-		</jt-popup> -->
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: '头部标题',
-				height: '600rem',
-				headerheight: '200rem'
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.main {
-		display: inline-block;
-		width: 100%;
-		height: 100%;
-	}
-
-	.trend-container2 {
-		width: 100%;
-		height: 100%;
-	}
-</style>

+ 1 - 1
vite.config.js

@@ -19,7 +19,7 @@ export default defineConfig({
 	// 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上,例如 https://www.ruoyi.vip/。
 	// 如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
 	// base: './',
-	base: process.env.NODE_ENV === 'production' ? './' : '/sdjn/',
+	base: process.env.NODE_ENV === 'production' ? './' : '/sdjt/',
 
 	resolve: {
 		alias: {

Vissa filer visades inte eftersom för många filer har ändrats