From 5ae3b6c3d604f16c2ecc5057d720d5d79c8c091b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:21:33 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 167 +++++++++++++++++++++++++++++++------------------------
1 files changed, 95 insertions(+), 72 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index c125dd0..b2c4243 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -56,8 +56,8 @@
<span class="machine-put-flag">鍏ュ簱</span>
<span class="machine-take-flag">鍑哄簱</span>
<span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
+<!-- <span class="machine-site-move-flag">绔欏埌绔�</span>-->
+<!-- <span class="machine-p-move-flag">PToP</span>-->
<span class="machine-error-flag">寮傚父</span>
<span class="machine-auto-flag">鑷姩</span>
<span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
@@ -555,6 +555,7 @@
var sites = res.data;
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
+ // console.log(sites[i].siteStatus);
siteEl.attr("class", "site " + sites[i].siteStatus);
if (sites[i].workNo != null && sites[i].workNo > 0) {
siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
@@ -689,82 +690,104 @@
}
}
- // 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- // debugger
var targetTop = 0;
- if (id === 1 || id === '1' || id === '2' || id === 2 || id === '3' || id === 3 ||id === '4' || id === 4) {
- switch (target) {
- case 1004:
- targetTop += 84;
- break;
- case 1007:
- targetTop += 128;
- break;
- case 1010:
- targetTop += 190;
- break;
- case 1014:
- targetTop += 240;
- break;
- case 1018:
- targetTop += 300;
- break;
- case 1021:
- targetTop += 350;
- break;
- case 1024:
- targetTop += 415;
- break;
- case 1028:
- targetTop += 465;
- break;
- case 1031:
- targetTop += 530;
- break;
- case 1035:
- targetTop += 580;
- break;
- case 2003:
- targetTop += 84;
- break;
- case 2006:
- targetTop += 128;
- break;
- case 2009:
- targetTop += 19.;
- break;
- case 2012:
- targetTop += 240;
- break;
- case 2015:
- targetTop += 300;
- break;
- case 2018:
- targetTop += 350;
- break;
- case 2021:
- targetTop += 415;
- break;
- case 2024:
- targetTop += 465;
- break;
- case 2027:
- targetTop += 530;
- break;
- case 2030:
- targetTop += 580;
- break;
- default:
- return;
- }
- } else {
- return;
+
+ // 纭繚 target 鏄湁鏁堢殑绔欑偣
+ if (target === -1) {
+ console.log("绔欑偣鏃犳晥锛岃烦杩囧姩鐢�");
+ return; // 璺宠繃鏃犳晥绔欑偣
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 0);
+ // 璁＄畻鐩爣绔欑偣鐨� top 鍊�
+ switch (target) {
+ case 1004:
+ targetTop += 84;
+ break;
+ case 1007:
+ targetTop += 128;
+ break;
+ case 1010:
+ targetTop += 190;
+ break;
+ case 1014:
+ targetTop += 240;
+ break;
+ case 1018:
+ targetTop += 300;
+ break;
+ case 1021:
+ targetTop += 350;
+ break;
+ case 1024:
+ targetTop += 415;
+ break;
+ case 1028:
+ targetTop += 465;
+ break;
+ case 1031:
+ targetTop += 530;
+ break;
+ case 1035:
+ targetTop += 580;
+ break;
+ case 2003:
+ targetTop += 84;
+ break;
+ case 2006:
+ targetTop += 128;
+ break;
+ case 2009:
+ targetTop += 190;
+ break;
+ case 2012:
+ targetTop += 240;
+ break;
+ case 2015:
+ targetTop += 300;
+ break;
+ case 2018:
+ targetTop += 350;
+ break;
+ case 2021:
+ targetTop += 415;
+ break;
+ case 2024:
+ targetTop += 465;
+ break;
+ case 2027:
+ targetTop += 530;
+ break;
+ case 2030:
+ targetTop += 580;
+ break;
+ default:
+ console.log("鏃犳晥鐨勭洰鏍囩珯鐐癸細" + target);
+ return; // 鏃犳晥鐨勭珯鐐癸紝璺宠繃
+ }
+
+ // 纭繚鐩爣绔欑偣鐨� DOM 鍏冪礌瀛樺湪
+ var siteElement = $("#site-" + id);
+ if (!siteElement.length) {
+ console.log("鏈壘鍒扮珯鐐瑰厓绱狅細" + id);
+ return; // 濡傛灉绔欑偣鍏冪礌涓嶅瓨鍦紝璺宠繃
+ }
+
+ // 鑾峰彇褰撳墠绔欑偣浣嶇疆
+ var currentTop = siteElement.position().top;
+
+ // 璁＄畻涓や釜绔欑偣涔嬮棿鐨勮窛绂�
+ var distance = Math.abs(targetTop - currentTop);
+
+ // 璁＄畻鍔ㄧ敾鏃堕棿锛岃窛绂昏秺杩滄椂闂磋秺闀匡紝鏈�灏忔椂闂翠负500ms锛屾渶澶т负2000ms
+ var duration = Math.max(500, Math.min(distance / 2, 2000));
+
+ // 鎵ц鍔ㄧ敾锛屽钩婊戝湴绉诲姩鍒扮洰鏍囦綅缃�
+ siteElement.animate({ top: targetTop + 'px' }, duration);
}
+
+
// 妫�鏌� URL 涓槸鍚﹀寘鍚� fullscreen=true 鍙傛暟
function checkFullscreen() {
const urlParams = new URLSearchParams(window.location.search);
--
Gitblit v1.9.1