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/templates/main.html | 203 ++++++++++++++++++++++++++++++++------------------
1 files changed, 131 insertions(+), 72 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 ff61655..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,10 @@
.content {
width: 100%;
background-color: rgba(0,0,0,0.01) !important;
+ padding:10px;
+ }
+ [v-cloak]{
+ display: none;
}
.el-card__header{
height: 40px;
@@ -24,7 +28,19 @@
border-radius: 50%;
font-size: 14px;
color: white;
- background: #314659;
+ background: #F56C6C;
+ text-align: center;
+ line-height: 20px;
+ float: left;
+ }
+
+ .active-yellow{
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ font-size: 14px;
+ color: white;
+ background: #E6A23C;
text-align: center;
line-height: 20px;
float: left;
@@ -34,9 +50,9 @@
width: 20px;
height: 20px;
border-radius: 50%;
- font-size: 16px;
+ font-size: 14px;
color: white;
- background: dodgerblue;
+ background: #67C23A;
text-align: center;
line-height: 20px;
float: left;
@@ -62,36 +78,54 @@
}
.rankrow{
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>
<body class="gray-bg">
- <div class="content" id="app">
- <el-row style="height: 130px;">
+ <div class="content" id="app" v-cloak>
+ <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>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">34涓�
+ <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>
+
+ <div style="flex:6;" class="ilblock">
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
鍗忚皟涓�
- <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;">
- 寰呭紑宸� 34
- <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;">
- 杩涜涓� 0
- <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>
@@ -100,22 +134,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;">
- 鎬昏繘灏� 134,1000.00m
- <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;">
- 宸插畬鎴� 12,322.23m
- <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>
@@ -123,44 +160,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>
- <div>
- <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">3813
+ <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>
+
+ <div style="flex:6;" class="ilblock">
<span style="color:rgba(0,0,0,.65);font-size: 15px;">
- 鎬昏繘灏� 134,1000.00m
- <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;">
- 宸插畬鎴� 12,322.23m
- <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;">
+ 璐ㄩ噺璧勬枡 <span style="float: right">0</span>
+<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
@@ -175,7 +226,7 @@
</div>
</el-card>
- <el-card class="box-card">
+ <el-card class="box-card" style="margin-top: 4px;">
<div id="map_div" style="width: 100%;height: 550px;"></div>
</el-card>
@@ -189,29 +240,34 @@
<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
</el-card>
- <el-card class="box-card">
- <div style="width: 100%;height: 20px;">
+ <el-card class="box-card" style="margin-top: 4px;">
+ <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">
<h3>鍦哄湴璇︾粏杩涘害(%)</h3>
</div>
<div style="width: 100%;height: 500px;overflow: auto">
-<!-- <el-row class="rankrow" v-for='entity in stationProcessData'>-->
-<!-- <el-col :span="2">-->
-<!-- <div class="active-red">{{entity.ranking}}</div>-->
-<!-- </el-col>-->
+ <el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
+ <el-col :span="2" >
+ <div v-if="entity.status=='鍗忚皟涓�'" class="active-red">{{entity.ranking}}</div>
+ <div v-if="entity.status=='寰呭紑宸�'" class="active-yellow">{{entity.ranking}}</div>
+ <div v-if="entity.status=='杩涜涓�'" class="active-blue">{{entity.ranking}}</div>
-<!-- <el-col :span="4">-->
-<!-- <div style="font-size: 16px">{{entity.station}}</div>-->
-<!-- </el-col >-->
+ </el-col>
-<!-- <el-col :span="4">-->
-<!-- <div style="font-size: 16px">{{entity.status}}</div>-->
-<!-- </el-col>-->
+ <el-col :span="7">
+ <div style="font-size: 16px">{{entity.station}}</div>
+ </el-col >
-<!-- <el-col :span="12">-->
-<!-- <div><el-progress :stroke-width="12" :percentage="{{entity.status}}"></el-progress></div>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
+ <el-col :span="5">
+ <div style="font-size: 16px">{{entity.status}}</div>
+ </el-col>
+
+ <el-col :span="8">
+ <div>
+ <el-progress :stroke-width="10" :percentage="entity.value"></el-progress>
+ </div>
+ </el-col>
+ </el-row>
</div>
@@ -244,26 +300,29 @@
loadMap();
getReallyData();
totalProcess();
- //stationProcess();
+ stationProcess();
indexCount();
})
+ function viewStation(station) {
+ var lng = station.lng;
+ var lat = station.lat;
+ map.centerAndZoom(new T.LngLat(lng, lat), 13);
+ // $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
+ }
function indexCount() {
let url = ctx + "/system/indexDataCount";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
- console.log(res);
- //vm.indexDataCount = res.projectData;
+ vm.indexDataCount = res.data;
})
$.ajaxSettings.async = false;
- console.log(vm.stationProcessData);
}
function stationProcess() {
let url = ctx + "/system/projectProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
- console.log(res.projectData);
vm.stationProcessData = res.projectData;
})
$.ajaxSettings.async = false;
--
Gitblit v1.9.1