From a1f05ddf1901ef80cb10cff9af57f457c99121c6 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 17:25:03 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 289da23..bb1dc48 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -176,7 +176,7 @@
<div style="flex:4;padding-right: 20px;">
<div>
<li class="el-icon-coin" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #085abe"></li>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">閽诲瓟杩涘昂</span>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">閽诲瓟鏁伴噺</span>
</div>
<div style="text-align: center">
<span style="color:#1894F6;font-size: 30px;word-break: break-all;line-height: 70px;">647
@@ -219,7 +219,7 @@
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.87);font-size: 15px;">
- 鏈畨瑁� <span style="float: right">68</span>
+ 鏈畨瑁� <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
@@ -294,7 +294,7 @@
<el-card class="box-card">
<div style="height: 200px;width: 100%">
<div style="width: 100%;height: 20px;">
- <h3>椤圭洰鎬讳綋杩涘害2(%)</h3>
+ <h3>椤圭洰鎬讳綋杩涘害(%)</h3>
</div>
<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
</div>
@@ -356,8 +356,13 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
+ var loginuser = [[${loginuser}]];
$(function() {
+ if(loginuser=='admin'){
+ window.open("http://49.4.115.102:8000/onemap/onemap.html","_blank");
+ }
+
loadMap();
getReallyData();
totalProcess();
@@ -455,6 +460,7 @@
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.indexDataCount = res.data;
+ vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
})
$.ajaxSettings.async = false;
@@ -507,6 +513,8 @@
map.addOverLay(countriesOverlay1)
countriesOverlay.bringToBack();
});
+
+ //map.setStyle("indigo");
}
function init(sel, transform) {
@@ -558,12 +566,28 @@
}
//鍦板浘涓婂睍绀洪」鐩偣
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});
@@ -615,7 +639,7 @@
$.ajaxSettings.async = false;
$.get(url,{},function(res){
pointerData = res.pointerData;
- pointerData = (pointerData*100).toFixed(0);
+ pointerData = (pointerData*100).toFixed(2);
});
$.ajaxSettings.async = false;
--
Gitblit v1.9.1