From 1d5de440ca3f4c1ae379979118ba213fb82a7dec Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 三月 2023 10:31:27 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor.css | 17 ++++++++
src/main/webapp/views/monitor.html | 61 ++++++++++++++++++++++++++++--
2 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/monitor.css b/src/main/webapp/views/monitor.css
index ffc73b1..236097a 100644
--- a/src/main/webapp/views/monitor.css
+++ b/src/main/webapp/views/monitor.css
@@ -740,4 +740,21 @@
height: 100%;
border: 1px solid #8d8d8d;
border-radius: 5px;
+}
+
+.info-head {
+ display: flex;
+ flex-direction: row;
+ background-color: #94c7c7;
+ text-align: center;
+ align-items: center;
+ height: 80px;
+}
+.info-context {
+ display: flex;
+ flex-direction: row;
+ background-color: #cae3e3;
+ text-align: center;
+ align-items: center;
+ height: 60px;
}
\ No newline at end of file
diff --git a/src/main/webapp/views/monitor.html b/src/main/webapp/views/monitor.html
index 0c36dea..1e10315 100644
--- a/src/main/webapp/views/monitor.html
+++ b/src/main/webapp/views/monitor.html
@@ -42,16 +42,33 @@
<!-- <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>-->
<!--</div>-->
<div class="canves1">
- <div style="width: 25%;height: 100%;font-size: 30px;display: flex;flex-direction: column;justify-content: space-around">
+ <div style="width: 25%;height: 100%;font-size: 30px;display: flex;flex-direction: column;justify-content: space-around;display: none">
<div style="width: 100%;height: 100px;line-height: 100px;text-align: center">绱琛岃蛋锛�10869绫�</div>
<div style="width: 100%;height: 100px;line-height: 100px;text-align: center">绱琛岃蛋锛�10869绫�</div>
<div style="width: 100%;height: 100px;line-height: 100px;text-align: center">绱琛岃蛋锛�10869绫�</div>
<div style="width: 100%;height: 100px;line-height: 100px;text-align: center">绱琛岃蛋锛�10869绫�</div>
</div>
- <div style="width: 50%;height: 100%;font-size: 30px;display: flex;flex-direction: column;justify-content: space-around;background-color: #93D1FF;text-align: center">
+ <div id="ledData" style="width: 50%;height: 100%;font-size: 30px;display: flex;flex-direction: column;justify-content: space-around;background-color: #93D1FF;text-align: center;display: none">
AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM
</div>
- <div style="width: 25%;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center">
+ <div id="ledData1" style="width: 100%;height: 100%;font-size: 30px;display: flex;flex-direction: column;background-color: #93D1FF;">
+ <div class="info-head">
+ <!--澶撮儴-->
+ <div style="flex: 2">鎵樼洏鐮�:80001289</div>
+ <div style="flex: 2">鍟嗗搧缂栧彿</div>
+ <div style="flex: 2">鍟嗗搧鍚嶇О</div>
+ <div style="flex: 2">瑙勬牸</div>
+ <div style="flex: 1">鏁伴噺</div>
+ </div>
+ <div class="info-context">
+ <div style="flex: 2">index</div>
+ <div style="flex: 2">77008945781523</div>
+ <div style="flex: 2">瑗跨摐</div>
+ <div style="flex: 2">500g</div>
+ <div style="flex: 1">30</div>
+ </div>
+ </div>
+ <div style="width: 25%;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center;display: none">
<div style="width: 80%;height: 40%">
<div id="line-charts"></div>
</div>
@@ -424,9 +441,10 @@
var crnId = 1;
var lcdId = 110;
+ var lcdData = 'TEST DATA'
+ var lcdControll = 1;
$('.lcd').click(function () {
var id = this.id.split("-")[1];
-
switch (id) {
case 1:
crnId = 1;
@@ -445,12 +463,47 @@
initlineChart();
initPieChart();
getOther2(crnId,lcdId)
+ getInfo(lcdId);
+ getError(lcdId);
}, 1000);
+
+
+ function getInfo(ledId) {
+ $.ajax({
+ url: baseUrl+"/monitor/led",
+ data: {ledId:ledId},
+ method: 'GET',
+ success: function (res) {
+ if (lcdControll == 3) {
+ $('#ledData')
+ }
+ }
+ });
+ }
+
+ function getError(ledId) {
+ $.ajax({
+ url: baseUrl+"/monitor/led/error",
+ data: {ledId:ledId},
+ method: 'GET',
+ success: function (res) {
+ if (lcdControll == 2) {
+ $('#ledData').text(res.data)
+ }
+ }
+ });
+ }
+
+
+
+
/***********************************************************************************/
/************************************ 鍫嗗灈鏈洪�熷害 *************************************/
/***********************************************************************************/
+
+
var crnChart = echarts.init(document.getElementById('crn-chart'));
crnChartOption = {
// backgroundColor: '#1b1b1b',
--
Gitblit v1.9.1