From 280001d476b92bf2d14052518e6f69bee9dee43d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:13:15 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 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..25eb478 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>
@@ -260,32 +260,7 @@
<el-row>
<el-col :span="16">
<el-card class="box-card">
- <div style="height: 200px;width: 100%;">
- <h3>鏉愭枡缁熻</h3>
- <el-col :span="10" style="height: 200px;">
- <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>
- </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;margin-top: -5px"></div>
+ <div id="map_div" style="width: 100%;height: 600px;margin-top: -5px"></div>
</el-card>
</el-col>
@@ -294,7 +269,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>
@@ -302,10 +277,10 @@
<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">
+<!-- <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">-->
+<!-- <h3>鍦哄湴璇︾粏杩涘害(%)</h3>-->
+<!-- </div>-->
+ <div style="width: 100%;height: 330px;overflow: auto">
<el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
<el-col :span="2" >
@@ -356,8 +331,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 +435,7 @@
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.indexDataCount = res.data;
+ vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
})
$.ajaxSettings.async = false;
@@ -507,6 +488,8 @@
map.addOverLay(countriesOverlay1)
countriesOverlay.bringToBack();
});
+
+ //map.setStyle("indigo");
}
function init(sel, transform) {
@@ -558,12 +541,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});
@@ -576,7 +575,7 @@
function infoWindowProject(e){
- let ids = e.ids + "";
+ let ids = e.ids + "," + e.code;
var sContent =
"<div style='margin:0px;'>" +
"<div>" +
@@ -590,8 +589,11 @@
"</div>";
return sContent;
}
- function viewdata (id) {
- $.modal.openTab("鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
+ function viewdata (idcode) {
+ var strs = idcode.split(",");
+ var id =strs[0];
+ var code = strs[1];
+ $.modal.openTab(code + " 鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
}
function addClickHandler(content, marker) {
@@ -615,7 +617,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