From 9293fcd88772d5230530488908e49250117df187 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 17:13:00 +0800
Subject: [PATCH] 调代码
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 161 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 121 insertions(+), 40 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..7fec47c 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -90,6 +90,46 @@
line-height: 30px;
}
+
+ <!-- 琛ㄦ牸鏍峰紡 -->
+ .el-table, .el-table__expanded-cell {
+ background-color: transparent;
+ color: #4D4D4D;
+ font-size: 13px;
+ }
+
+ .el-table th,
+ .el-table tr,
+ .el-table td {
+ background-color: transparent;
+ border: 0px;
+ color: #4D4D4D;
+ font-size: 13px;
+ font-family: Source Han Sans CN Normal, Source Han Sans CN Normal-Normal;
+ font-weight: Normal;
+ }
+ .el-table::before {
+ height: 0px;
+ }
+ .el-table__body tr,
+ .el-table__body td {
+ padding: 0;
+ height: 22px;
+ }
+ .el-table__row.warning-row {
+ background:rgb(252,212,165);
+ }
+ .el-table__body-wrapper::-webkit-scrollbar-track {
+ background-color: rgb(252,212,165);
+ }
+ .el-table__body-wrapper::-webkit-scrollbar {
+ width: 10px;
+ opacity: 0.5;
+ }
+ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ border-radius: 15px;
+ background-color:rgb(252,212,165);
+ }
</style>
</head>
@@ -104,7 +144,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>
@@ -140,7 +180,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>
@@ -166,7 +206,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>
@@ -194,7 +234,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>
@@ -221,12 +261,28 @@
<el-row>
<el-col :span="16">
<el-card class="box-card">
- <div style="height: 200px;">
+ <div style="height: 200px;width: 100%;">
<h3>鏉愭枡缁熻</h3>
+ <el-col :span="10" style="height: 200px;">
+ <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>
+ </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>
@@ -234,41 +290,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>
@@ -302,25 +361,38 @@
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/stat/tubLogData";
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.tubLogs = res.tubLogs;
+ })
+ $.ajaxSettings.async = false;
+ console.log(vm.tubLogs);
+ }
+
+ //棣栭〉绗竴琛屼釜鏁扮粺璁�
function indexCount() {
- let url = ctx + "/system/indexDataCount";
+ let url = ctx + "/system/stat/indexDataCount";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.indexDataCount = res.data;
})
$.ajaxSettings.async = false;
- }
+ }
+ //鍦哄湴杩涘害
function stationProcess() {
- let url = ctx + "/system/projectProcess";
+ let url = ctx + "/system/stat/projectProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.stationProcessData = res.projectData;
@@ -335,9 +407,17 @@
return {
stationProcessData: [],
indexDataCount :"",
+ tubLogs:[],
};
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "";
+ } else {
+ return "warning-row";
+ }
+ },
}
});
// 鍔犺浇鍦板浘
@@ -403,7 +483,7 @@
// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
function getReallyData() {
- let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
+ let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/stat/project";
$.get(url,function(res){
var data = res.projects;
showProjectPoint(data);
@@ -463,12 +543,13 @@
function totalProcess() {
var Chart1 = echarts.init(document.getElementById('Chart1'));
var pointerData = 0; // 浠〃鎸囬拡鏁版嵁
- let url = ctx + "/system/totalProcess";
+ let url = ctx + "/system/stat/totalProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
pointerData = res.pointerData;
pointerData = (pointerData*100).toFixed(0);
- })
+ });
+
$.ajaxSettings.async = false;
var option = {
backgroundColor: "#fff",
--
Gitblit v1.9.1