From 280001d476b92bf2d14052518e6f69bee9dee43d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:13:15 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 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 bb1dc48..25eb478 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -260,32 +260,7 @@
<el-row>
<el-col :span="16">
<el-card class="box-card">
- <div style="height: 200px;width: 100%;">
- <h3>鏉愭枡缁熻</h3>
- <el-col :span="10" style="height: 200px;">
- <div style="margin-top: 15px">
- <template>
- <el-table :data="tubLogs" border size="small" style="width: 100%"
- :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
- :row-class-name="tableRowClassName">
- <!-- <el-table-column prop="code" label="搴忓彿"></el-table-column>-->
- <el-table-column prop="tubName" label="鍚嶇О"></el-table-column>
- <el-table-column prop="inboundNumber" label="鍏ュ簱鏁伴噺"></el-table-column>
- <el-table-column prop="outboundNumber" label="鍑哄簱鏁伴噺"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅"></el-table-column>
-
- </el-table>
- </template>
- </div>
- </el-col>
- <el-col :span="14" style="height: 200px;">
- <div id="column-chart" style="height: 180px; width: 100%;"></div>
- </el-col>
- </div>
- </el-card>
-
- <el-card class="box-card" style="margin-top: 20px;">
- <div id="map_div" style="width: 100%;height: 550px;margin-top: -5px"></div>
+ <div id="map_div" style="width: 100%;height: 600px;margin-top: -5px"></div>
</el-card>
</el-col>
@@ -302,10 +277,10 @@
<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">
+<!-- <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">-->
+<!-- <h3>鍦哄湴璇︾粏杩涘害(%)</h3>-->
+<!-- </div>-->
+ <div style="width: 100%;height: 330px;overflow: auto">
<el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
<el-col :span="2" >
@@ -600,7 +575,7 @@
function infoWindowProject(e){
- let ids = e.ids + "";
+ let ids = e.ids + "," + e.code;
var sContent =
"<div style='margin:0px;'>" +
"<div>" +
@@ -614,8 +589,11 @@
"</div>";
return sContent;
}
- function viewdata (id) {
- $.modal.openTab("鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
+ function viewdata (idcode) {
+ var strs = idcode.split(",");
+ var id =strs[0];
+ var code = strs[1];
+ $.modal.openTab(code + " 鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
}
function addClickHandler(content, marker) {
--
Gitblit v1.9.1