From 78c7b6c6dfe40761e7b8eb60498f2eb73c0aaad1 Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期四, 17 十月 2024 14:58:26 +0800
Subject: [PATCH] 登录页修改
---
src/assets/logo/Login3.png | 0
src/views/visualization/bottomMenu.vue | 25 ++++---
src/assets/logo/形状 5.png | 0
src/assets/logo/形状 6.png | 0
src/assets/logo/图层 3.png | 0
src/views/visualization/list/chart1.vue | 8 ++
src/views/login.vue | 59 ++++++++++++++-----
src/views/visualization/list/chartList1.vue | 2
src/assets/logo/形状 4.png | 0
src/views/visualization/list/chartList.vue | 23 +++++++
src/views/visualization/index.vue | 4
src/views/visualization/list/chart.vue | 10 ++
src/views/visualization/list/chart2.vue | 9 ++
13 files changed, 106 insertions(+), 34 deletions(-)
diff --git a/src/assets/logo/Login3.png b/src/assets/logo/Login3.png
new file mode 100644
index 0000000..c61fb87
--- /dev/null
+++ b/src/assets/logo/Login3.png
Binary files differ
diff --git "a/src/assets/logo/\345\233\276\345\261\202 3.png" "b/src/assets/logo/\345\233\276\345\261\202 3.png"
new file mode 100644
index 0000000..f64fc5c
--- /dev/null
+++ "b/src/assets/logo/\345\233\276\345\261\202 3.png"
Binary files differ
diff --git "a/src/assets/logo/\345\275\242\347\212\266 4.png" "b/src/assets/logo/\345\275\242\347\212\266 4.png"
new file mode 100644
index 0000000..906135d
--- /dev/null
+++ "b/src/assets/logo/\345\275\242\347\212\266 4.png"
Binary files differ
diff --git "a/src/assets/logo/\345\275\242\347\212\266 5.png" "b/src/assets/logo/\345\275\242\347\212\266 5.png"
new file mode 100644
index 0000000..fa462c3
--- /dev/null
+++ "b/src/assets/logo/\345\275\242\347\212\266 5.png"
Binary files differ
diff --git "a/src/assets/logo/\345\275\242\347\212\266 6.png" "b/src/assets/logo/\345\275\242\347\212\266 6.png"
new file mode 100644
index 0000000..dd0cfdc
--- /dev/null
+++ "b/src/assets/logo/\345\275\242\347\212\266 6.png"
Binary files differ
diff --git a/src/views/login.vue b/src/views/login.vue
index a5d3ec0..c9067dd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,37 +5,46 @@
<div class="logImg"></div>
</div>
- <div class="titleItem">
+ <!-- <div class="titleItem">
<div class="logText">鏁板瓧瀛敓鏅鸿兘閰嶇綉宸℃绯荤粺</div>
- </div>
+ </div> -->
</div>
<div class="logContent">
<div class="contFrom">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <div style="margin-bottom: 10px; font-size: 14px; font-family: '寰蒋闆呴粦'; color: #f78e21">婕旂ず璐﹀彿锛歠astbee 123456</div> -->
- <el-form-item prop="username" >
- <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
- <svg-icon slot="prefix" icon-class="user" class="input-icon" />
+ <el-form-item label="鐢ㄦ埛鍚�"></el-form-item>
+ <el-form-item prop="username">
+ <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="Admin">
+ <template slot="prefix">
+ <img src="../assets/logo/褰㈢姸 4.png" alt="Custom Icon" style="width: 1rem; height: 1rem;">
+ </template>
</el-input>
</el-form-item>
+ <el-form-item label="瀵嗙爜"></el-form-item>
<el-form-item prop="password">
<el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="瀵嗙爜"
@keyup.enter.native="handleLogin">
- <svg-icon slot="prefix" icon-class="password" class="input-icon" />
+ <template slot="prefix">
+ <img src="../assets/logo/褰㈢姸 5.png" alt="Custom Icon" style="width: 1rem; height: 1rem;">
+ </template>
</el-input>
</el-form-item>
+ <el-form-item label="楠岃瘉鐮�"></el-form-item>
<el-form-item v-if="captchaOnOff" prop="code">
<el-input v-model="loginForm.code" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%"
@keyup.enter.native="handleLogin">
- <svg-icon slot="prefix" icon-class="validCode" class="input-icon" />
+ <template slot="prefix">
+ <img src="../assets/logo/褰㈢姸 6.png" alt="Custom Icon" style="width: 1rem; height: 1rem;">
+ </template>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCode" />
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe"
- style="margin: 0px 0px 25px 0px; color: #000">璁颁綇瀵嗙爜</el-checkbox>
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px; font-family: Source Han Sans SC;
+ color: #ffffff;">璁颁綇瀵嗙爜</el-checkbox>
<el-form-item style="width: 100%">
<div style="margin-bottom: 10px">
@@ -336,13 +345,13 @@
// overflow: auto;
width: 100%;
position: absolute;
- background: url('../assets/logo/sdw.png') no-repeat;
+ background: url('../assets/logo/鍥惧眰 3.png') no-repeat;
background-size: 100% 100%;
.logoTitle {
- height: 266px;
- background: rgba(51, 132, 198, 1);
+ height: 100%;
+ background: #368ED5;
width: 100%;
z-index: -1;
position: absolute;
@@ -353,12 +362,13 @@
height: 100%;
display: flex;
align-items: center;
+ height: 266px;
}
.logImg {
- width: 89px;
- height: 89px;
- background: url('../assets/logo/logo2.png') no-repeat;
+ width: 570px;
+ height: 90px;
+ background: url('../assets/logo/Login3.png') no-repeat;
background-size: 100% 100%;
}
@@ -381,6 +391,8 @@
.contFrom {
flex: 1;
+
+
}
.contMessage {
@@ -388,6 +400,8 @@
display: flex;
justify-content: center;
line-height: 40px;
+ font-family: Source Han Sans SC;
+ color: #ffffff;
}
}
@@ -434,5 +448,20 @@
}
}
+ ::v-deep .el-form-item__label {
+ line-height: 0px !important;
+ font-family: Source Han Sans SC;
+ color: #ffffff;
+ font-weight: 300;
+ margin-top: 10px;
+ font-size: 16px;
+ line-height: 10px;
+ }
+
+ ::v-deep .el-button {
+ background: transparent !important;
+ border-color: #ffffff;
+ height: 52px;
+ }
}
</style>
diff --git a/src/views/visualization/bottomMenu.vue b/src/views/visualization/bottomMenu.vue
index d70cfa1..e5909e8 100644
--- a/src/views/visualization/bottomMenu.vue
+++ b/src/views/visualization/bottomMenu.vue
@@ -31,7 +31,7 @@
return {
menuOption: [
{
- name: '閰嶇綉宸℃',
+ name: '涓�浣撳缓妯�',
children: [
{
id: 'a1',
@@ -44,21 +44,24 @@
}
]
}, {
- name: '閰嶇綉杩愭',
+ name: '鍥炬ā铻嶅悎',
children: [{
id: 'a1',
name: '鏁版嵁缁熻',
pid: 's2',
}]
- }, {
- name: '鐏惧绠＄悊',
- children: [{
- id: 'a1',
- name: '鏁版嵁鍒嗘瀽',
- pid: 's3',
- }]
- }, {
- name: '鏁板瓧绾挎崯',
+ },
+
+ // {
+ // name: '鐏惧绠＄悊',
+ // children: [{
+ // id: 'a1',
+ // name: '鏁版嵁鍒嗘瀽',
+ // pid: 's3',
+ // }]
+ // },
+ {
+ name: '閰嶇綉杩愭',
}
],
diff --git a/src/views/visualization/index.vue b/src/views/visualization/index.vue
index cbc4349..aa10c39 100644
--- a/src/views/visualization/index.vue
+++ b/src/views/visualization/index.vue
@@ -173,7 +173,7 @@
}
.leftMenu {
- width: 15%;
+ width: 12%;
top: 90px;
left: 10px;
height: calc(100% - 180px);
@@ -182,7 +182,7 @@
}
.rightMenu {
- width: 15%;
+ width: 12%;
top: 90px;
right: 10px;
height: calc(100% - 180px);
diff --git a/src/views/visualization/list/chart.vue b/src/views/visualization/list/chart.vue
index e9ad81e..73df6d7 100644
--- a/src/views/visualization/list/chart.vue
+++ b/src/views/visualization/list/chart.vue
@@ -116,6 +116,12 @@
}
const myChart = echarts.init(id);
var option = {
+ grid: {
+ left: "10%",
+ top: "10%",
+ right: "5%",
+ bottom: "25%",
+ },
title: {
text: "",
textStyle: {
@@ -163,7 +169,7 @@
option && myChart.setOption(option);
},
setEchartChange(res) {
-
+
this.roadItem = res.val[0]
this.showEchart();
@@ -189,7 +195,7 @@
color: #fff;
width: 100%;
height: 45px;
- line-height: 45px;
+ line-height: 30px;
background-size: 100% 100%;
background-repeat: no-repeat;
}
diff --git a/src/views/visualization/list/chart1.vue b/src/views/visualization/list/chart1.vue
index 9e17075..6ee422b 100644
--- a/src/views/visualization/list/chart1.vue
+++ b/src/views/visualization/list/chart1.vue
@@ -117,6 +117,12 @@
}
const myChart = echarts.init(id);
var option = {
+ grid: {
+ left: "10%",
+ top: "10%",
+ right: "5%",
+ bottom: "25%",
+ },
title: {
text: "",
textStyle: {
@@ -187,7 +193,7 @@
color: #fff;
width: 100%;
height: 45px;
- line-height: 45px;
+ line-height:30px;
background-size: 100% 100%;
background-repeat: no-repeat;
}
diff --git a/src/views/visualization/list/chart2.vue b/src/views/visualization/list/chart2.vue
index b55b5d9..221ec60 100644
--- a/src/views/visualization/list/chart2.vue
+++ b/src/views/visualization/list/chart2.vue
@@ -117,7 +117,14 @@
}
const myChart = echarts.init(id);
var option = {
+ grid: {
+ left: "10%",
+ top: "10%",
+ right: "5%",
+ bottom: "20%",
+ },
title: {
+
text: "",
textStyle: {
color: "white"
@@ -189,7 +196,7 @@
color: #fff;
width: 100%;
height: 45px;
- line-height: 45px;
+ line-height: 30px;
background-size: 100% 100%;
background-repeat: no-repeat;
}
diff --git a/src/views/visualization/list/chartList.vue b/src/views/visualization/list/chartList.vue
index e62d2c5..a9cc92d 100644
--- a/src/views/visualization/list/chartList.vue
+++ b/src/views/visualization/list/chartList.vue
@@ -63,7 +63,7 @@
color: #fff;
width: 100%;
height: 45px;
- line-height: 45px;
+ line-height: 30px;
background-size: 100% 100%;
background-repeat: no-repeat;
}
@@ -76,6 +76,7 @@
display: flex;
flex-direction: column;
justify-content: space-around;
+ overflow: auto;
.chartTd {
width: 100%;
@@ -100,4 +101,24 @@
}
}
+/*婊氬姩鏉℃暣浣撴牱寮�*/
+::-webkit-scrollbar {
+ /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ width: 1px;
+ height: 1px;
+}
+
+/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: #409EFF;
+}
+
+/*婊氬姩鏉￠噷闈㈣建閬�*/
+::-webkit-scrollbar-track {
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ border-radius: 10px;
+ background: rgba(237, 237, 237, .1);
+}
</style>
\ No newline at end of file
diff --git a/src/views/visualization/list/chartList1.vue b/src/views/visualization/list/chartList1.vue
index 9cb4eb4..beae0d3 100644
--- a/src/views/visualization/list/chartList1.vue
+++ b/src/views/visualization/list/chartList1.vue
@@ -66,7 +66,7 @@
color: #fff;
width: 100%;
height: 45px;
- line-height: 45px;
+ line-height: 30px;
background-size: 100% 100%;
background-repeat: no-repeat;
}
--
Gitblit v1.9.3