From 17c44d69651ddae3ab2093d8560a3d46db87dd8d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期一, 27 五月 2024 19:30:47 +0800
Subject: [PATCH] 提交代码

---
 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html |   90 ++++++++++++++++++--------------------------
 1 files changed, 37 insertions(+), 53 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 c6eb966..fdb62d4 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -15,9 +15,6 @@
 		background-color: rgba(0,0,0,0.01) !important;
 		padding:10px;
 	}
-	body{
-		padding: 10px;
-	}
 	[v-cloak]{
 		display: none;
 	}
@@ -107,7 +104,7 @@
 							<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 style="color:#ED1C24;font-size: 30px;word-break: break-all;line-height: 70px">34
 						</span>
 						</div>
 					</div>
@@ -143,7 +140,7 @@
 							<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 style="color:#1894F6;font-size: 30px;word-break: break-all;line-height: 70px;">647
 						</span>
 						</div>
 					</div>
@@ -169,7 +166,7 @@
 							<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 style="color:#F7931E;font-size: 30px;word-break: break-all;line-height: 70px">68
 						</span>
 						</div>
 					</div>
@@ -197,7 +194,7 @@
 							<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;">
+						<span style="color:#F7931E;font-size: 30px;word-break: break-all;line-height: 70px;">
 							{{indexDataCount.fileCount}}
 						</span>
 						</div>
@@ -224,18 +221,12 @@
 		<el-row>
 			<el-col :span="16">
 				<el-card class="box-card">
-					<div>
+					<div style="height: 200px;">
 						<h3>鏉愭枡缁熻</h3>
-
-						<el-col :span="10" style="height: 200px;">
-						</el-col>
-						<el-col :span="14" style="height: 200px;">
-						</el-col>
 					</div>
-
 				</el-card>
 
-				<el-card class="box-card" style="margin-top: 4px;">
+				<el-card class="box-card" style="margin-top: 20px;">
 					<div id="map_div" style="width: 100%;height: 550px;"></div>
 				</el-card>
 
@@ -243,41 +234,44 @@
 
 			<el-col :span="8">
 				<el-card class="box-card">
-					<div style="width: 100%;height: 20px;">
-						<h3>椤圭洰鎬讳綋杩涘害(%)</h3>
+					<div style="height: 200px;width: 100%">
+						<div style="width: 100%;height: 20px;">
+							<h3>椤圭洰鎬讳綋杩涘害2(%)</h3>
+						</div>
+						<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
 					</div>
-					<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
 				</el-card>
 
-				<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-card class="box-card" style="margin-top: 20px;">
+					<div style="width: 100%">
+						<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' @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-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>
+								</el-col>
 
-							<el-col :span="7">
-								<div style="font-size: 16px">{{entity.station}}</div>
-							</el-col >
+								<el-col :span="7">
+									<div style="font-size: 16px">{{entity.station}}</div>
+								</el-col >
 
-							<el-col :span="5">
-								<div style="font-size: 16px">{{entity.status}}</div>
-							</el-col>
+								<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>
-
+								<el-col :span="8">
+									<div>
+										<el-progress :stroke-width="10" :percentage="entity.value"></el-progress>
+									</div>
+								</el-col>
+							</el-row>
+						</div>
 					</div>
 
 				</el-card>
@@ -311,21 +305,12 @@
 		totalProcess();
 		stationProcess();
 		indexCount();
-		tubLogs();
 	})
 	function viewStation(station) {
 		var lng = station.lng;
 		var lat = station.lat;
 		map.centerAndZoom(new T.LngLat(lng, lat), 13);
-	}
-
-	function tubLogs() {
-		let url = ctx + "/system/tubLogData";
-		$.ajaxSettings.async = false;
-		$.get(url,{},function(res){
-			vm.tubLogData = res.tubLogData;
-		})
-		$.ajaxSettings.async = false;
+		// $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
 	}
 
 	function indexCount() {
@@ -353,7 +338,6 @@
 			return {
 				stationProcessData: [],
 				indexDataCount :"",
-				tubLogData:[],
 			};
 		},
 		methods: {

--
Gitblit v1.9.1