From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/webapp/views/monitor.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/monitor.html b/src/main/webapp/views/monitor.html
index b15a72d..d4b9aef 100644
--- a/src/main/webapp/views/monitor.html
+++ b/src/main/webapp/views/monitor.html
@@ -158,7 +158,7 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</span>
+ <span>绫冲</span>
<img src="../static/images/barcode.png">
</div>
</div>
@@ -385,14 +385,18 @@
$('.lcd').click(function () {
var id = this.id.split("-")[1];
switch (id) {
- case '1':
+ case '100':
crnId = 1;
lcdId = 100;
break;
- case '2':
- crnId = 2;
+ case '110':
+ crnId = 1;
lcdId = 110;
break;
+ case '113':
+ crnId = 2;
+ lcdId = 113;
+ break;
}
getOther2(crnId,lcdId)
})
--
Gitblit v1.9.1