From 4640dc7ce69ed3ca79b84ad739750c35e7e7be5e Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 17:17:05 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 127 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 34 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 89c9673..119fd49 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -85,7 +85,7 @@
padding: 0 40px;
align-content: center;
}
- .ilblock span{
+ .ilblock>span{
display: block;
line-height: 30px;
}
@@ -150,19 +150,18 @@
</div>
<div style="flex:6;" class="ilblock">
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
鍗忚皟涓�
- <span style="float: right">
- {{indexDataCount.projectStatus0}}
- </span>
+ <span style="float: right">{{indexDataCount.projectStatus0}}</span>
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
+
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
寰呭紑宸�
<span style="float: right">{{indexDataCount.projectStatus1}}</span>
<!-- <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
杩涜涓�
<span style="float: right">{{indexDataCount.projectStatus2}}</span>
<!-- <li class="el-icon-caret-top" style="color: #409eff">-->
@@ -186,11 +185,11 @@
</div>
<div style="flex:6;" class="ilblock">
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
鎬昏繘灏� <span style="float: right">{{indexDataCount.footageCount}}m</span>
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
宸插畬鎴� <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
@@ -215,11 +214,11 @@
<div>
</div>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
宸插畨瑁� <span style="float: right">0</span>
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
鏈畨瑁� <span style="float: right">68</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
@@ -241,15 +240,15 @@
</div>
<div style="flex:6;" class="ilblock">
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
鏂藉伐璧勬枡 <span style="float: right">0</span>
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
瀹夊叏璧勬枡 <span style="float: right">0</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;">
+ <span style="color:rgba(0,0,0,.87);font-size: 15px;">
璐ㄩ噺璧勬枡 <span style="float: right">0</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
@@ -264,26 +263,29 @@
<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>
+ <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>
+ </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;"></div>
+ <div id="map_div" style="width: 100%;height: 550px;margin-top: -5px"></div>
</el-card>
</el-col>
@@ -371,18 +373,77 @@
}
function tubLogs() {
- let url = ctx + "/system/tubLogData";
+
+ const chart = echarts.init(document.getElementById("column-chart"));
+ const option = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {},
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: 'category',
+ data: []
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '鍑哄簱',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+ {
+ name: '鍏ュ簱',
+ type: 'bar',
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+
+ ]
+ };
+
+ let url = ctx + "/system/stat/tubLogData";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.tubLogs = res.tubLogs;
+
+ res.tubLogs.forEach(function(value, index, array) {
+ const tubName = value.tubName;
+ const inboundNumber = value.inboundNumber;
+ const outboundNumber = value.outboundNumber;
+ const unit = value.unit;
+ option.xAxis[0].data[index] = tubName;
+ option.series[0].data[index] = outboundNumber;
+ option.series[1].data[index] = inboundNumber;
+ });
+ chart.setOption(option, true);
})
$.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;
@@ -392,14 +453,12 @@
}
//鍦哄湴杩涘害
function stationProcess() {
- let url = ctx + "/system/projectProcess";
+ let url = ctx + "/system/stat/projectProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.stationProcessData = res.projectData;
})
$.ajaxSettings.async = false;
- console.log(vm.stationProcessData);
-
}
var vm = new Vue({
el: "#app",
@@ -483,7 +542,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);
@@ -543,7 +602,7 @@
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;
--
Gitblit v1.9.1