From 7b7739d6afec561c7b1beb889ee2ff4fcddbe60b Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 24 五月 2024 13:46:16 +0800
Subject: [PATCH] 样式修改
---
javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css | 2
javaweb-plus/javaweb-admin/src/main/resources/templates/index.html | 2
javaweb-plus/javaweb-admin/src/main/resources/templates/index_topMenu.html | 2
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 105 ++++++++++++++++++++++++++++++----------------------
4 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
index 28ba2cd..c5c725a 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
@@ -16,7 +16,7 @@
}
.skin-blue .navbar .nav>li>a {
- color: #fff
+ color: #565656
}
.skin-blue .navbar .nav>li>a:hover,
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
index 6fbea05..5af6c70 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
@@ -174,7 +174,7 @@
<i class="fa fa-bars"></i>
</a>
</div>
- <ul class="nav navbar-top-links navbar-right welcome-message">
+ <ul class="nav navbar-top-links navbar-right welcome-message"style="margin: 0;">
<!-- <li><a title="瑙嗛鏁欑▼" href="http://doc.ruoyi.vip/ruoyi/document/spjc.html" target="_blank"><i class="fa fa-video-camera"></i> 瑙嗛鏁欑▼</a></li> -->
<!-- <li><a title="寮�鍙戞枃妗�" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 寮�鍙戞枃妗�</a></li> -->
<li><a title="鍏ㄥ睆鏄剧ず" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆鏄剧ず</a></li>
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index_topMenu.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index_topMenu.html
index f110a6a..4b01ac3 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index_topMenu.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/index_topMenu.html
@@ -64,7 +64,7 @@
</div>
- <ul class="nav navbar-top-links navbar-right welcome-message">
+ <ul class="nav navbar-top-links navbar-right welcome-message" >
<li><a title="鍏ㄥ睆鏄剧ず" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆鏄剧ず</a></li>
<li class="dropdown user-menu">
<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 3617db7..130194e 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -13,6 +13,7 @@
.content {
width: 100%;
background-color: rgba(0,0,0,0.01) !important;
+ padding:10px;
}
[v-cloak]{
display: none;
@@ -79,6 +80,15 @@
margin-top: 12px;
cursor: pointer;
}
+ .ilblock{
+ border-left: 1px solid #e3e5e7;
+ padding: 0 40px;
+ align-content: center;
+ }
+ .ilblock span{
+ display: block;
+ line-height: 30px;
+ }
</style>
</head>
@@ -88,29 +98,34 @@
<el-row style="height: 127px;">
<el-col :span="6">
<el-card class="box-card">
- <div style="flex:4;">
+ <div style="flex:4;padding-right: 20px;" >
<div>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">鍦哄湴鏁伴噺</span>
- <li class="el-icon-s-promotion" style="font-size: 18px;float: right;color: grey">
+ <li class="el-icon-s-promotion" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #409eff;"></li>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">鍦哄湴鏁伴噺</span>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">34涓�
+ <div style="text-align: center;">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">34
</span>
</div>
</div>
- <div style="flex:6;">
+ <div style="flex:6;" class="ilblock">
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 鍗忚皟涓� {{indexDataCount.projectStatus0}}
- <li class="el-icon-caret-bottom" style="color: #f56c6c">
+ 鍗忚皟涓�
+ <span style="float: right">
+ {{indexDataCount.projectStatus0}}
+ </span>
+<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 寰呭紑宸� {{indexDataCount.projectStatus1}}
- <li class="el-icon-caret-bottom" style="color: #e6a23c">
+ 寰呭紑宸�
+ <span style="float: right">{{indexDataCount.projectStatus1}}</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 杩涜涓� {{indexDataCount.projectStatus2}}
- <li class="el-icon-caret-top" style="color: #409eff">
+ 杩涜涓�
+ <span style="float: right">{{indexDataCount.projectStatus2}}</span>
+<!-- <li class="el-icon-caret-top" style="color: #409eff">-->
</span>
</div>
@@ -119,25 +134,25 @@
<el-col :span="6">
<el-card class="box-card">
- <div style="flex:4;">
+ <div style="flex:4;padding-right: 20px;">
<div>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">閽诲瓟杩涘昂</span>
- <li class="el-icon-coin" style="font-size: 18px;float: right;color: grey">
+ <li class="el-icon-coin" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #085abe"></li>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">閽诲瓟杩涘昂</span>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">647涓�
+ <div style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">647
</span>
</div>
</div>
- <div style="flex:6;">
+ <div style="flex:6;" class="ilblock">
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 鎬昏繘灏� {{indexDataCount.footageCount}}m
- <li class="el-icon-caret-bottom" style="color: #f56c6c">
+ 鎬昏繘灏� <span style="float: right">{{indexDataCount.footageCount}}m</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 宸插畬鎴� {{indexDataCount.footageCplCount}}m
- <li class="el-icon-caret-bottom" style="color: #409eff">
+ 宸插畬鎴� <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
</el-card>
@@ -145,58 +160,58 @@
<el-col :span="6">
<el-card class="box-card">
- <div style="flex:4;">
+ <div style="flex:4;padding-right: 20px;">
<div>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">瀹炴椂鐩戞帶</span>
- <li class="el-icon-video-camera" style="font-size: 18px;float: right;color: grey">
+ <li class="el-icon-video-camera" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #11d713"></li>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">瀹炴椂鐩戞帶</span>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">68涓�
+ <div style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">68
</span>
</div>
</div>
- <div style="flex:6;">
+ <div style="flex:6;" class="ilblock">
<div>
</div>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 宸插畨瑁� 0
- <li class="el-icon-caret-bottom" style="color: #f56c6c">
+ 宸插畨瑁� <span style="float: right">0</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 鏈畨瑁� 68
- <li class="el-icon-caret-bottom" style="color: #409eff">
+ 鏈畨瑁� <span style="float: right">68</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card class="box-card">
- <div style="flex:4;">
+ <div style="flex:4;padding-right: 20px;">
<div>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">璧勬枡鏂囦欢</span>
- <li class="el-icon-s-order" style="font-size: 18px;float: right;color: grey">
+ <li class="el-icon-s-order" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #917ed0"></li>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">璧勬枡鏂囦欢</span>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">
- {{indexDataCount.fileCount}}浠�
+ <div style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">
+ {{indexDataCount.fileCount}}
</span>
</div>
</div>
- <div style="flex:6;">
+ <div style="flex:6;" class="ilblock">
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 鏂藉伐璧勬枡 0
- <li class="el-icon-caret-bottom" style="color: #f56c6c">
+ 鏂藉伐璧勬枡 <span style="float: right">0</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 瀹夊叏璧勬枡 0
- <li class="el-icon-caret-bottom" style="color: #409eff">
+ 瀹夊叏璧勬枡 <span style="float: right">0</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 璐ㄩ噺璧勬枡 0
- <li class="el-icon-caret-bottom" style="color: #409eff">
+ 璐ㄩ噺璧勬枡 <span style="float: right">0</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
--
Gitblit v1.9.1