From c93663ce356988b6e1391170312028a6e7636518 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:09 +0800
Subject: [PATCH] 更改左上角logo
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 582 ++++++++++++++++++++++------------------------------------
1 files changed, 222 insertions(+), 360 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 ce0adc3..5d6e63c 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -2,61 +2,56 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('寮瑰眰缁勪欢')" />
-<link href="../static/css/bootstrap.min.css"
- th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
-<link href="../static/css/font-awesome.min.css"
- th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
-<link href="../static/css/main/animate.min.css"
- th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
-<link href="../static/css/main/style.min862f.css"
- th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
+<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
+<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
+<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
+<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
- <th:block th:include="include :: datetimepicker-css" />
- <style type="text/css">
- .content {
- width: 100%;
- background-color: rgba(0,0,0,0.01) !important;
- }
- </style>
+<link href="../static/js/elementUI/index.css" th:href="@{/js/elementUI/index.css}" rel="stylesheet" />
+
+<style type="text/css">
+ .content {
+ width: 100%;
+ background-color: rgba(0,0,0,0.01) !important;
+ padding:10px;
+ }
+ [v-cloak]{
+ display: none;
+ }
+ .ilblock>span{
+ display: block;
+ line-height: 30px;
+ }
+ .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__body tr,
+ .el-table__body td {
+ padding: 0;
+ height: 22px;
+ }
+ .custom-icon:hover {
+ color: #0981ea;
+ cursor: pointer;
+ }
+</style>
</head>
<body class="gray-bg">
- <div class="content">
- <div class="col-sm-12">
- <div class="ibox float-e-margins">
- <div class="ibox-title">
- <h3>娌夐檷鐩戞祴缃戝缓璁惧伐绋嬮」鐩垎甯�</h3>
- </div>
- <div class="ibox-content">
-
- <div class="row">
- <div class="col-sm-8">
- <div id="map_div" style="width: 100%;height: 750px;"></div>
- </div>
-
- <div class="col-sm-4">
- <div >
- <div style="width: 100%;height: 20px;">
- <h3>椤圭洰鎬讳綋杩涘害(%)</h3>
- </div>
- <div id="Chart1" style="width: 80%;height: 250px;margin-left: 10%;"></div>
- </div>
-
- <div >
- <div style="width: 100%;height: 20px;">
- <h3>鍦哄湴璇︾粏杩涘害(%)</h3>
- </div>
- <div style="width: 100%;height: 500px;overflow: auto">
- <div id="Chart2" style="width: 100%;height: 1500px;"></div>
- </div>
-
- </div>
-
- </div>
- </div>
- </div>
- </div>
+ <div class="content" id="app" v-cloak>
+ <div id="map_div" style="position:fixed;width: 100%;height: 100vh;margin-top: -5px"></div>
+ <div style="position:fixed;top: 5px">
+ <li onclick="careraFunction()" class="el-icon-video-camera custom-icon" style="font-size: 100px;margin-right: 5px;margin-left: -5px;"></li>
+ <li onclick="tubFunction()" class="el-icon-user custom-icon" style="font-size: 100px;margin-right: 5px;margin-left: -5px;"></li>
</div>
+ <div id="Chart1" style="position:fixed;width: 300px;height: 300px;bottom: -60px;right: -40px"></div>
</div>
@@ -68,6 +63,10 @@
<script src="http://lbs.tianditu.gov.cn/js/lib/d3/d3.min.js" type="text/javascript"></script>
<script src="http://lbs.tianditu.gov.cn/api/js4.0/opensource/openlibrary/D3SvgOverlay.js" type="text/javascript"></script>
<script th:src="@{/js/custom/main.js}"></script>
+
+ <script th:src="@{/js/vue.min.js}"></script>
+ <script th:src="@{/js/elementUI/index.js}"></script>
+
<th:block th:include="include :: sparkline-js" />
<th:block th:include="include :: footer" />
@@ -77,9 +76,146 @@
loadMap();
getReallyData();
totalProcess();
- stationProcess();
-
+ //stationProcess();
+ //indexCount();
+ //tubLogs();
})
+ //鍦哄湴鍜屽湴鍥剧偣鍑昏仈鍔�
+ function viewStation(station) {
+ var lng = station.lng;
+ var lat = station.lat;
+ map.centerAndZoom(new T.LngLat(lng, lat), 13);
+ }
+
+ function tubLogs() {
+
+ 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: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#e2b507'
+ }
+ },
+ {
+ name: '鍏ュ簱',
+ type: 'bar',
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ data: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#2992c6'
+ }
+ },
+
+ ]
+ };
+
+ 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;
+ }
+
+ //棣栭〉绗竴琛屼釜鏁扮粺璁�
+ function indexCount() {
+ let url = ctx + "/system/stat/indexDataCount";
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.indexDataCount = res.data;
+ vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
+ })
+ $.ajaxSettings.async = false;
+
+ }
+
+ //鎽勫儚澶村垪琛�
+ function careraFunction() {
+ let url = ctx + "/system/camera";
+ $.modal.openTab("鎽勫儚澶村垪琛�",url);
+ }
+
+ //绠℃潗缁熻
+ function tubFunction() {
+ let url = ctx + "/system/tub";
+ $.modal.openTab("绠℃潗缁熻",url);
+ }
+
+ //鍦哄湴杩涘害
+ function stationProcess() {
+ let url = ctx + "/system/stat/projectProcess";
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.stationProcessData = res.projectData;
+ })
+ $.ajaxSettings.async = false;
+ }
+ var vm = new Vue({
+ el: "#app",
+ data() {
+ return {
+ stationProcessData: [],
+ indexDataCount :"",
+ tubLogs:[],
+ };
+ },
+ methods: {
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "";
+ } else {
+ return "warning-row";
+ }
+ },
+ }
+ });
// 鍔犺浇鍦板浘
let map=null;
var countries = [];
@@ -100,6 +236,8 @@
map.addOverLay(countriesOverlay1)
countriesOverlay.bringToBack();
});
+
+ //map.setStyle("indigo");
}
function init(sel, transform) {
@@ -143,7 +281,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);
@@ -151,17 +289,35 @@
}
//鍦板浘涓婂睍绀洪」鐩偣
function showProjectPoint(data){
- var projectIcon = new T.Icon({
- iconUrl: '/bjfw/images/icon/6.png',
- iconSize: new T.Point(30, 30),
- iconAnchor: new T.Point(6, 40),
- });
+ var projectIcon;
for(let i =0;i<data.length;i++){
+
+ if (data[i].status === '1'){
+ projectIcon = new T.Icon({
+ iconUrl: '/bjfw/images/icon/yellow.png',
+ iconSize: new T.Point(30, 30),
+ iconAnchor: new T.Point(6, 40),
+ });
+ }else if (data[i].status === '2'){
+ projectIcon = new T.Icon({
+ iconUrl: '/bjfw/images/icon/blue.png',
+ iconSize: new T.Point(30, 30),
+ iconAnchor: new T.Point(6, 40),
+ });
+ }else {
+ projectIcon = new T.Icon({
+ iconUrl: '/bjfw/images/icon/red.png',
+ iconSize: new T.Point(30, 30),
+ iconAnchor: new T.Point(6, 40),
+ });
+ }
+
let lng = data[i].lng;
let lat = data[i].lat;
let marker = new T.Marker(new T.LngLat(lng, lat), { title: "鍦哄湴浣嶇疆",icon:projectIcon});
let proj = infoWindowProject(data[i]);
addClickHandler(proj, marker);
+
map.addOverLay(marker);
}
@@ -177,7 +333,7 @@
"<font style='font-weight: bolder;'>鍦哄湴缂栧彿 :</font>" + e.code + "<br>" +
"<font style='font-weight: bolder;'>鍦哄湴鍚嶅瓧 :</font>" + e.fullName + "<br>" +
"<font style='font-weight: bolder;'>璐熻矗浜� :</font>" + e.leader + "<br>" +
- "<a class='btn' onclick=viewdata(" +"'" + ids+ "'" + ")>鍦哄湴鏁版嵁</a>" +
+ "<a class='btn' onclick=viewdata(" +"'" + ids+ "'" + ")>鍦哄湴鏁版嵁</a>" + "<br>" +
"</div>" +
"</div>" +
"</div>";
@@ -189,6 +345,7 @@
function addClickHandler(content, marker) {
marker.addEventListener("click", function (e) {
+ console.log("浣犵偣鍑讳簡",content);
openInfo(content, e)
});
}
@@ -199,23 +356,25 @@
map.openInfoWindow(markerInfoWin, point); //寮�鍚俊鎭獥鍙�
}
+
//鎬昏繘搴︿华琛ㄧ洏
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",
+ backgroundColor: "transparent",
series: [
{
type: "gauge",
- radius: 120,
+ radius: 80,
z: 1,
startAngle: 225,
endAngle: -45,
@@ -350,303 +509,6 @@
Chart1.setOption(option);
}
- var datas = [
- { ranking: 1, station: '鍦哄湴001', value: 85 },
- { ranking: 2, station: '鍦哄湴002', value: 22 },
- { ranking: 3, station: '鍦哄湴003', value: 33 },
- { ranking: 4, station: '鍦哄湴004', value: 40 },
- { ranking: 5, station: '鍦哄湴005', value: 33 },
- { ranking: 6, station: '鍦哄湴006', value: 14.97 },
- { ranking: 7, station: '鍦哄湴007', value: 13.03 },
- { ranking: 8, station: '鍦哄湴008', value: 18.48 },
- { ranking: 9, station: '鍦哄湴009', value: 16.74 },
- { ranking: 10, station: '鍦哄湴010', value: 14.97 },
-
- { ranking: 11, station: '鍦哄湴011', value: 13.03 },
- { ranking: 12, station: '鍦哄湴012', value: 18.48 },
-
- { ranking: 13, station: '鍦哄湴013', value: 16.74 },
- { ranking: 14, station: '鍦哄湴014', value: 14.97 },
- { ranking: 15, station: '鍦哄湴015', value: 13.03 },
- { ranking: 16, station: '鍦哄湴016', value: 18.48 },
-
- { ranking: 17, station: '鍦哄湴017', value: 16.74 },
- { ranking: 18, station: '鍦哄湴018', value: 14.97 },
- { ranking: 19, station: '鍦哄湴019', value: 13.03 },
- { ranking: 20, station: '鍦哄湴020', value: 18.48 },
-
- { ranking: 21, station: '鍦哄湴021', value: 16.74 },
- { ranking: 22, station: '鍦哄湴022', value: 14.97 },
- { ranking: 23, station: '鍦哄湴023', value: 13.03 },
- { ranking: 24, station: '鍦哄湴024', value: 18.48 },
-
- { ranking: 25, station: '鍦哄湴025', value: 16.74 },
- { ranking: 26, station: '鍦哄湴026', value: 14.97 },
- { ranking: 27, station: '鍦哄湴027', value: 13.03 },
- { ranking: 28, station: '鍦哄湴028', value: 18.48 },
-
- { ranking: 29, station: '鍦哄湴029', value: 13.03 },
- { ranking: 30, station: '鍦哄湴030', value: 18.48 },
- { ranking: 31, station: '鍦哄湴031', value: 13.03 },
- { ranking: 32, station: '鍦哄湴032', value: 18.48 },
- { ranking: 33, station: '鍦哄湴033', value: 13.03 },
- { ranking: 34, station: '鍦哄湴034', value: 18.48 },
- ];
-
-
- var seriesName = ['宸插畬鎴愯繘搴�','鎬昏繘搴�'];
- var attackSourcesColor1 = ['#FF557F','#FFAA00','#5470C6','#1E9FFF'];
-
- var attackSourcesColor = [
- new echarts.graphic.LinearGradient(0, 1, 1, 1, [
- { offset: 0, color: 'rgba(255,85,127,1)' },
- { offset: 1, color: 'rgba(255,85,127,1)' },
- ]),
- new echarts.graphic.LinearGradient(0, 1, 1, 1, [
- { offset: 0, color: 'rgba(255,170,0,1)' },
- { offset: 1, color: 'rgba(255,170,0,1)' },
- ]),
- new echarts.graphic.LinearGradient(0, 1, 1, 1, [
- { offset: 0, color: 'rgba(84,112,198,1)' },
- { offset: 1, color: 'rgba(84,112,198,1)' },
- ]),
- new echarts.graphic.LinearGradient(0, 1, 1, 1, [
- { offset: 0, color: 'rgba(30,159,255,.82)' },
- { offset: 1, color: 'rgba(30,159,255,.82)' },
- ]),
- ];
-
- function stationProcess() {
-
- let url = ctx + "/system/projectProcess";
- $.ajaxSettings.async = false;
- $.get(url,{},function(res){
- console.log(res.projectData);
- datas = res.projectData;
- })
- $.ajaxSettings.async = false;
-
-
- var Chart2 = echarts.init(document.getElementById('Chart2'));
- var rankings = [];
- var stationData = [];
- var values = [];
-
- datas.forEach(function (it, index) {
- rankings.push(it.ranking);
- stationData.push(it.station);
- values.push(it.value);
- });
-
- option = {
- // backgroundColor: '#000',
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow',
- },
- },
-
- grid: {
- left: '-8%',
- right: '2%',
- bottom: '3%',
- top:'2%',
- containLabel: true,
- },
- xAxis: {
- type: 'value',
- splitLine: {
- show: false,
- },
- axisLabel: {
- show: false,
- },
- axisTick: {
- show: false,
- },
- axisLine: {
- show: false,
- },
- },
- yAxis: [
- {
- type: 'category',
- inverse: true,
- axisLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
- data: stationData,
- axisLabel: {
- margin: 30,
- fontSize: 14,
- align: 'left',
- padding: [3, 0, 0, 0],
- color: '#000',
- rich: {
- nt1: {
- color: '#fff',
- backgroundColor: attackSourcesColor1[0],
- width: 20,
- height: 18,
- fontSize: 12,
- align: 'center',
- borderRadius: 50,
- lineHeight: '5',
- padding: [2, 0, 0, 0],
- // padding:[0,0,2,0],
- },
- nt2: {
- color: '#fff',
- backgroundColor: attackSourcesColor1[1],
- width: 20,
- height: 18,
- fontSize: 12,
- align: 'center',
- borderRadius: 50,
- padding: [2, 0, 0, 0],
- },
- nt3: {
- color: '#fff',
- backgroundColor: attackSourcesColor1[2],
- width: 20,
- height: 18,
- fontSize: 12,
- align: 'center',
- borderRadius: 50,
- padding: [2, 0, 0, 0],
- },
- nt: {
- color: '#fff',
- backgroundColor: attackSourcesColor1[3],
- width: 20,
- height: 18,
- fontSize: 12,
- align: 'center',
- borderRadius: 50,
- padding: [2, 0, 0, 0],
- },
- },
- formatter: function (value, index) {
- index = contains(stationData, value) + 1;
- if (index - 1 < 3) {
- return ['{nt' + index + '|' + index + '}'].join('\n');
- } else {
- return ['{nt|' + index + '}'].join('\n');
- }
- },
- },
- },
-
- {
- type: 'category',
- inverse: true,
- axisTick: 'none',
- axisLine: 'none',
- show: true,
- axisLabel: {
- textStyle: {
- color: '#666',
- fontSize: '12',
- },
- },
- data: dataFormat(values),
- },
-
- { // 鏉＄姸鏍囬
- type: 'category',
- inverse: true,
- offset: -10,
- position: 'left',
- axisTick: 'none',
- axisLine: 'none',
- show: true,
- axisLabel: {
- interval: 0,
- color: ['#666'],
- align: 'left',
- verticalAlign: 'bottom',
- lineHeight: 42,
- fontSize: 14,
- },
- data: dataFormat(stationData),
- },
- ],
- series: [
- {
- zlevel: 1,
- name: seriesName[0],
- type: 'bar',
- barWidth: 15,
- data: dataFormat(values),
- align: 'center',
- itemStyle: {
- normal: {
- barBorderRadius: 10,
- },
- },
- label: { //鏉＄姸涓殑鏍峰紡
- show: true,
- fontSize: 10,
- color: '#fff', //鏉¤涓瓧浣撻鑹�
- textBorderWidth: 2,
- padding: [2, 0, 0, 0],
- },
- },
- {
- name: seriesName[1],
- type: 'bar',
- barWidth: 15,
- barGap: '-100%',
- data: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 100, 100, 100],
- itemStyle: {
- normal: {
- color: 'rgba(200,200,200,.3)',
- //width:"100%",
- fontSize: 12,
- barBorderRadius: 30,
- },
- },
- },
- ],
- };
- Chart2.setOption(option);
- }
-
- function dataFormat(data) {
- var arr = [];
- data.forEach(function (item, i) {
- let itemStyle = {
- color: i > 3 ? attackSourcesColor[3] : attackSourcesColor[i],
- };
- arr.push({
- value: item,
- itemStyle: itemStyle,
- });
- });
- return arr;
- }
-
- function contains(arr, dst) {
- var i = arr.length;
- while ((i -= 1)) {
- if (arr[i] == dst) {
- return i;
- }
- }
- return false;
- }
-
-
-
-
</script>
-
</body>
</html>
--
Gitblit v1.9.1