From 77c5a9937bd6a2ffbb2a45c10fa5d65d66015397 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 27 十月 2023 14:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/webapp/views/monitor/index.html | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/monitor/index.html b/src/main/webapp/views/monitor/index.html
index 75e3549..82888f6 100644
--- a/src/main/webapp/views/monitor/index.html
+++ b/src/main/webapp/views/monitor/index.html
@@ -42,13 +42,7 @@
</div>
<div class="box">
<div class="box-title">鍚堟牸鐜�</div>
- <div style="display: flex;"class="box-body">
- <div class="box-body" id="barLabelRotation"></div>
- <!--<div class="box-body3" >-->
- <!-- <div class="percentage" id="thisWeek">60%</div>-->
- <!-- <div class="percentage" id="lastWeek">40%</div>-->
- <!--</div>-->
- </div>
+ <div class="box-body" id="barLabelRotation"></div>
</div>
</div>
</div>
@@ -99,7 +93,7 @@
document.msExitFullscreen();
}
}
- let url = 'http://192.168.4.188:8088/fnwms'
+ let url = 'http://10.12.55.200:8080/fnwms'
var item = [{locNo: '1',locSts: '1',mk: '1',packStatus$: '1'}]
var year = '2020';
var month = '05';
@@ -120,8 +114,8 @@
setDate();
},1000)
setInterval(()=>{
- //location.reload()
- },10000)
+ location.reload()
+ },600000)
function initTest() {
var box = ''
var el
@@ -163,13 +157,12 @@
$('#bar-hour').text(hour);
$('#bar-minute').text(minute);
$('#bar-second').text(second);
- $('#bar-week').text(week);
}
/**
* 鑾峰彇鏃堕棿
*/
function getDate() {
- http.get("http://localhost:9090/fnwcs/monitor/date", null, function (res) {
+ http.get("http://10.12.55.200:8080/fnwcs/monitor/date", null, function (res) {
if (res.code === 200){
year = res.data.year;
month = res.data.month;
@@ -202,7 +195,7 @@
}
},
legend: {
- textStyle:{color:'#FFF'},
+ textStyle:{color:'#FFF',},
},
grid: {
left: '3%',
@@ -218,7 +211,7 @@
color: '#FFF'
}
},
- data: ['鍏朵粬', '娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '娴嬭瘯鍓嶆殏瀛樺簱涓�', '娴嬭瘯澶辫触搴撲綅']
+ data: ['娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '鏆傚瓨搴撲綅', 'NG搴撲綅']
}
],
yAxis: [
@@ -287,7 +280,7 @@
}
},
legend: {
- textStyle:{color:'#FFF'},
+ textStyle:{color:'#FFF',fontSize:14},
},
grid: {
left: '3%',
@@ -335,7 +328,7 @@
stack: 'Ad',
label: {
show: true,
- fontSize: 16,fontWeight: 'bold',
+ fontSize: 14,fontWeight: 'bold',
position: 'top',offset: [-15,5],
},
data: [9, 3]
@@ -354,10 +347,9 @@
legend: {
icon: 'roundRect',
data: ['鍑哄簱', '鍏ュ簱'],
- textStyle:{color:'#FFF'},
+ textStyle:{color:'#FFF',fontSize:14},
},
grid: { // 鍥捐〃璺濈杈规鐨勮窛绂伙紝鍙敤鐧惧垎姣斿拰鏁板瓧锛坧x锛夐厤缃�
- top: '20%',
left: '3%',
right: '5%',
bottom: '5%',
--
Gitblit v1.9.1