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/main3.html | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
similarity index 95%
rename from javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html
rename to javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
index 09db381..c6eb966 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
@@ -15,6 +15,9 @@
background-color: rgba(0,0,0,0.01) !important;
padding:10px;
}
+ body{
+ padding: 10px;
+ }
[v-cloak]{
display: none;
}
@@ -221,12 +224,18 @@
<el-row>
<el-col :span="16">
<el-card class="box-card">
- <div style="height: 200px;">
+ <div>
<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: 20px;">
+ <el-card class="box-card" style="margin-top: 4px;">
<div id="map_div" style="width: 100%;height: 550px;"></div>
</el-card>
@@ -234,15 +243,13 @@
<el-col :span="8">
<el-card class="box-card">
- <div style="height: 200px;">
- <div style="width: 100%;height: 20px;">
- <h3>椤圭洰鎬讳綋杩涘害(%)</h3>
- </div>
- <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
+ <div style="width: 100%;height: 20px;">
+ <h3>椤圭洰鎬讳綋杩涘害(%)</h3>
</div>
+ <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
</el-card>
- <el-card class="box-card" style="margin-top: 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>
@@ -304,12 +311,21 @@
totalProcess();
stationProcess();
indexCount();
+ tubLogs();
})
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 tubLogs() {
+ let url = ctx + "/system/tubLogData";
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.tubLogData = res.tubLogData;
+ })
+ $.ajaxSettings.async = false;
}
function indexCount() {
@@ -337,6 +353,7 @@
return {
stationProcessData: [],
indexDataCount :"",
+ tubLogData:[],
};
},
methods: {
--
Gitblit v1.9.1