From ca1fa7d859c6ad07c15c9deb460bd92780162a60 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 01:02:49 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 59 ++++++++++++++++---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 7 +
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 86 +++++++++++++++++++++++++++-
3 files changed, 136 insertions(+), 16 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 fdb62d4..89c9673 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>
@@ -221,8 +261,24 @@
<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>
@@ -305,14 +361,26 @@
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.tubLogs = res.tubLogs;
+ })
+ $.ajaxSettings.async = false;
+ console.log(vm.tubLogs);
+ }
+
+ //棣栭〉绗竴琛屼釜鏁扮粺璁�
function indexCount() {
let url = ctx + "/system/indexDataCount";
$.ajaxSettings.async = false;
@@ -320,8 +388,9 @@
vm.indexDataCount = res.data;
})
$.ajaxSettings.async = false;
- }
+ }
+ //鍦哄湴杩涘害
function stationProcess() {
let url = ctx + "/system/projectProcess";
$.ajaxSettings.async = false;
@@ -338,9 +407,17 @@
return {
stationProcessData: [],
indexDataCount :"",
+ tubLogs:[],
};
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "";
+ } else {
+ return "warning-row";
+ }
+ },
}
});
// 鍔犺浇鍦板浘
@@ -471,7 +548,8 @@
$.get(url,{},function(res){
pointerData = res.pointerData;
pointerData = (pointerData*100).toFixed(0);
- })
+ });
+
$.ajaxSettings.async = false;
var option = {
backgroundColor: "#fff",
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index b8aa1a6..180fb5e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
@@ -13,8 +13,11 @@
height: 100%;
}
.el-card__header{
- height: 40px;
- padding: 8px 20px;
+ height: 55px;
+ padding: 18px 20px;
+ color: #FFFFFF;
+ font-weight: 500;
+ font-size: 14px;
}
#app {
height: 100%;
@@ -24,13 +27,37 @@
width: 180px !important;
height: 180px !important;
}
+ .card1{
+ height: 320px;margin-right: 20px;
+ }
+ .card-blue .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #1894F6;
+ }
+ .card-yellow .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #F7931E;
+ }
+ .card-red .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #FF0000;
+ }
+ .card-green .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #67C23A;
+ }
+
</style>
</head>
<body>
<div id="app" v-cloak>
<el-row style="height: 200px;">
<el-col :span="8">
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-blue" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
<span>鍦哄湴绠�浠�</span>
</div>
@@ -92,9 +119,9 @@
</el-col>
<el-col :span="10" >
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-yellow" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
- <span>鍦哄湴杩涘害</span>
+ <span>閽诲瓟杩涘害</span>
</div>
<template>
<el-table :data="holeData" size="small" style="width: 100%">
@@ -115,17 +142,29 @@
</el-col>
<el-col :span="6" >
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-red" style="height: 320px;">
<div slot="header" class="clearfix">
- <span>鍦哄湴杩涘害</span>
+ <span>鍦哄湴杩涘害(%)</span>
</div>
- <div style="">
- <el-progress type="dashboard" :percentage="50">
- </el-progress>
+ <div>
+ <div style="padding-left: 20%;">
+ <el-progress type="dashboard" color="#FF0000" :percentage="50">
+ </el-progress>
+ </div>
</div>
</el-card>
</el-col>
</el-row>
+ <el-row style="height: 200px;">
+ <el-col :span="24">
+ <el-card class="box-card card-green" style="height: 320px;margin-top: 20px">
+ <div slot="header" class="clearfix">
+ <span>鏉愭枡淇℃伅</span>
+ </div>
+ </el-card>
+ </el-col>
+
+ </el-row>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index 9a3893d..13e714e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -6,13 +6,16 @@
<th:block th:include="include :: ztree-css" />
<style>
.active {
- background: #41aae7;
+ background: #1894F6;
}
.active a {
color: white;
}
-.afont{font-size:14px;}
+.afont{
+ color: #4D4D4D;
+ font-size:14px;
+}
</style>
</head>
<body class="gray-bg">
--
Gitblit v1.9.1