From 9166b7b4bdb84bfe499078dd68add5c3e462411f Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期一, 27 五月 2024 18:09:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 132 +++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 51 deletions(-)
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 f9af9eb..c6eb966 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;
}
body{
padding: 10px;
@@ -82,6 +83,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>
@@ -91,26 +101,34 @@
<el-row style="height: 127px;">
<el-col :span="6">
<el-card class="box-card">
- <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">
+ <div style="flex:4;padding-right: 20px;" >
+ <div>
+ <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 style="text-align: center;">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">34
+ </span>
+ </div>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">34涓�
- </span>
- </div>
- <div>
+
+ <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,22 +137,25 @@
<el-col :span="6">
<el-card class="box-card">
- <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">
- </div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">647涓�
+ <div style="flex:4;padding-right: 20px;">
+ <div>
+ <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 style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">647
</span>
+ </div>
</div>
- <div>
+
+ <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>
@@ -142,49 +163,58 @@
<el-col :span="6">
<el-card class="box-card">
- <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">
- </div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">68涓�
+ <div style="flex:4;padding-right: 20px;">
+ <div>
+ <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 style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">68
</span>
+ </div>
</div>
- <div>
+
+ <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>
- <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">
+ <div style="flex:4;padding-right: 20px;">
+ <div>
+ <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 style="text-align: center">
+ <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">
+ {{indexDataCount.fileCount}}
+ </span>
+ </div>
</div>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">
- {{indexDataCount.fileCount}}浠�
- </span>
- </div>
- <div>
+
+ <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