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 | 127 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/views/monitor/index.html b/src/main/webapp/views/monitor/index.html
index 698134e..82888f6 100644
--- a/src/main/webapp/views/monitor/index.html
+++ b/src/main/webapp/views/monitor/index.html
@@ -15,7 +15,7 @@
<div class="head">
<div class="head-title">鑷姩浠撳簱鐩戞帶骞冲彴</div>
<div class="time-tools">
- <span id="bar-year"></span>-<span id="bar-month"></span>-<span id="bar-day"></span> <span id="bar-hour"></span>:<span id="bar-minute"></span>:<span id="bar-second"></span> <span id="bar-week"></span>
+ <span id="bar-year"></span>-<span id="bar-month"></span>-<span id="bar-day"></span> <span id="bar-hour"></span>:<span id="bar-minute"></span>:<span id="bar-second"></span>
</div>
</div>
<div class="body">
@@ -23,7 +23,7 @@
<div class="box">
<div class="box-title">娴嬭瘯鐘舵��</div>
<div class="box-body">
- <div class="table-head" style="display: flex"><div style="flex: 1">搴撲綅鍙�</div><div style="flex: 1">搴撲綅鐘舵��</div><div style="flex: 1">鍖呭彿</div><div style="flex: 1">娴嬭瘯鐘舵��</div></div>
+ <div class="table-head" style="display: flex"><div style="flex: 1">搴撲綅鍙�</div><div style="flex: 1">搴撲綅鐘舵��</div><div style="flex: 3">鍖呭彿</div><div style="flex: 1">娴嬭瘯鐘舵��</div></div>
<div class="swiper" style="height: 85%">
<div class="swiper-wrapper table-item">
</div>
@@ -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>
@@ -56,8 +50,51 @@
</body>
</html>
<script>
- let url = 'http://192.168.4.34:8080/fnwms'
- var item = []
+ // 宸�
+ $('.time-tools').click(function () {
+ exitFull();
+ });
+ $('.head-title').click(function () {
+ full();
+ });
+ //寮�濮嬪叏灞�
+ function full() {
+ var docElm = document.documentElement;
+ //W3C
+ if (docElm.requestFullscreen) {
+ docElm.requestFullscreen();
+ }
+ //FireFox
+ else if (docElm.mozRequestFullScreen) {
+ docElm.mozRequestFullScreen();
+ }
+ //Chrome绛�
+ else if (docElm.webkitRequestFullScreen) {
+ docElm.webkitRequestFullScreen();
+ }
+ //IE11
+ else if (elem.msRequestFullscreen) {
+ elem.msRequestFullscreen();
+ }
+ }
+
+ //閫�鍑哄叏灞�
+ function exitFull() {
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ }
+ else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ }
+ else if (document.webkitCancelFullScreen) {
+ document.webkitCancelFullScreen();
+ }
+ else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ }
+ }
+ 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';
var day = '01';
@@ -77,16 +114,28 @@
setDate();
},1000)
setInterval(()=>{
- //location.reload()
- },10000)
+ location.reload()
+ },600000)
function initTest() {
- console.log(item)
var box = ''
var el
+ var len = item.length
+ var autoplay = true
+ var css = 'table-td'
+ if (len == 0) {
+ box = "<div class='swiper-none'>鏆傛棤娴嬭瘯鏁版嵁</div>"
+ } else if (len < 5) {
+ var itemInfo = {locNo: '',locSts: '',mk: '',packStatus$: ''}
+ for (var j = 0; j < 5-len;j++) {
+ css = 'table-td2'
+ autoplay = false
+ item.push(itemInfo)
+ }
+ }
for (var i = 0; i < item.length; i++) {
- el = "<div class='swiper-slide table-td'><div style='flex: 1'>"
+ el = "<div class='swiper-slide "+ css + " '><div style='flex: 1'>"
+ item[i].locNo + "</div><div style='flex: 1'>"
- + item[i].locSts + "</div><div style='flex: 1'>"
+ + item[i].locSts + "</div><div style='flex: 3'>"
+ item[i].mk + "</div><div style='flex: 1'>"
+ item[i].packStatus$
+ "</div></div>"
@@ -96,7 +145,7 @@
var mySwiper = new Swiper ('.swiper', {
direction: 'vertical', // 鍨傜洿鍒囨崲閫夐」
loop: true, // 寰幆妯″紡閫夐」
- autoplay:true,
+ autoplay:autoplay,
slidesPerView: 5,
})
}
@@ -108,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;
@@ -147,7 +195,7 @@
}
},
legend: {
- textStyle:{color:'#FFF'},
+ textStyle:{color:'#FFF',},
},
grid: {
left: '3%',
@@ -163,7 +211,7 @@
color: '#FFF'
}
},
- data: ['鍏朵粬', '娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '娴嬭瘯鍓嶆殏瀛樺簱涓�', '娴嬭瘯澶辫触搴撲綅']
+ data: ['娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '鏆傚瓨搴撲綅', 'NG搴撲綅']
}
],
yAxis: [
@@ -232,7 +280,7 @@
}
},
legend: {
- textStyle:{color:'#FFF'},
+ textStyle:{color:'#FFF',fontSize:14},
},
grid: {
left: '3%',
@@ -261,26 +309,27 @@
{
name: '鍚堟牸',
type: 'bar',
- itemStyle: {
- normal: {
- label: {
- show: true,
- position: 'top'
- }
- }
+ stack: 'Ad',
+ label: {
+ show: true,
+ fontSize: 16,
+ fontWeight: 'bold',
+ position: 'top',
+ color: '#FFF',
+ offset: [15,5],
},
+ z:99,
+ barWidth:'50%',
data: [10, 1]
},
{
name: '涓嶅悎鏍�',
type: 'bar',
- itemStyle: {
- normal: {
- label: {
- show: true,
- position: 'top'
- }
- }
+ stack: 'Ad',
+ label: {
+ show: true,
+ fontSize: 14,fontWeight: 'bold',
+ position: 'top',offset: [-15,5],
},
data: [9, 3]
}
@@ -298,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%',
@@ -409,7 +457,6 @@
}
});
}
-
function initBasicInformation() {
$.ajax({
url: url+"/mobile/pack/basic/information",
@@ -420,7 +467,7 @@
for (var i = 0; i < res.data.length; i++) {
array.push(res.data[i])
}
- item = array
+ item = array
}
}
});
--
Gitblit v1.9.1