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 | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 130194e..c6eb966 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -15,6 +15,9 @@
background-color: rgba(0,0,0,0.01) !important;
padding:10px;
}
+ body{
+ padding: 10px;
+ }
[v-cloak]{
display: none;
}
@@ -221,9 +224,15 @@
<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: 4px;">
@@ -302,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() {
@@ -335,6 +353,7 @@
return {
stationProcessData: [],
indexDataCount :"",
+ tubLogData:[],
};
},
methods: {
--
Gitblit v1.9.1