From 11b28c7a6c5f0882b8385a370b20919c6246fc1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 五月 2023 08:05:24 +0800
Subject: [PATCH] 工作完成时状态码变更
---
src/main/webapp/views/console.html | 136 +++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index bc7bfd1..63e10eb 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -59,13 +59,7 @@
<!-- 鍥涘悜绌挎杞︾姸鎬� -->
<div class="line-status">
<div class="body-head">绌挎杞︾姸鎬�</div>
- <div class="state">
- <span>鍥涘悜绌挎杞� 1</span>
- <span class="state-ss shuttle-idle">绌洪棽</span>
- </div>
- <div class="state">
- <span>鍥涘悜绌挎杞� 2</span>
- <span class="state-ss shuttle-idle">绌洪棽</span>
+ <div id="shuttle-status-box">
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
@@ -75,20 +69,21 @@
<span class="shuttle-charging">鍏呯數涓�</span>
<span class="shuttle-charging-waiting">鍏呯數浠诲姟绛夊緟纭</span>
<span class="shuttle-fixing">鏁呴殰淇涓�</span>
+ <span class="shuttle-offline">绂荤嚎</span>
</div>
</div>
<!-- 鎻愬崌鏈虹姸鎬� -->
<div class="line-status">
<div class="body-head">鎻愬崌鏈虹姸鎬�</div>
- <div class="state states">
- <span>鎻愬崌鏈�</span>
- <span class="state-ss shuttle-idle">绌洪棽</span>
+ <div id="lift-status-box">
+
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
<span class="lift-idle">绌洪棽</span>
<span class="lift-working">浣滀笟涓�</span>
<span class="lift-waiting">绛夊緟纭</span>
+ <span class="lift-offline">绂荤嚎</span>
</div>
</div>
<!-- 杈撻�佺嚎鐘舵�� -->
@@ -418,7 +413,44 @@
setInterval(() => {
getShuttleStateInfo()
+ getLiftStateInfo()
},1000)
+
+ // 鎻愬崌鏈轰俊鎭〃鑾峰彇
+ function getLiftStateInfo() {
+ $.ajax({
+ url: baseUrl+ "/lift/table/lift/state",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ $("#lift-status-box").empty()
+ res.data.forEach((item,index) => {
+ let liftStatusClass = "lift-idle"
+ switch (item.status) {
+ case 1://绌洪棽
+ liftStatusClass = "lift-idle";
+ break
+ case 2://浣滀笟涓�
+ liftStatusClass = "lift-working";
+ break
+ case 3://绛夊緟纭
+ liftStatusClass = "lift-waiting";
+ break
+ case 4://绂荤嚎
+ liftStatusClass = "lift-offline";
+ break
+ default:
+ liftStatusClass = "lift-idle"
+ }
+ let liftStatus = '<div class="state states">' +
+ '<span>鎻愬崌鏈� ' + item.liftNo + '</span>' +
+ '<span class="state-ss ' + liftStatusClass + '">' + item.protocolStatus$ + '</span></div>';
+ $("#lift-status-box").append(liftStatus)
+
+ })
+ }
+ });
+ }
// 鍥涘悜绌挎杞︿俊鎭〃鑾峰彇
function getShuttleStateInfo() {
@@ -427,7 +459,39 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ $("#shuttle-status-box").empty()
res.data.forEach((item,index) => {
+ let shuttleStatusClass = "shuttle-idle"
+ switch (item.status) {
+ case 1://绌洪棽
+ shuttleStatusClass = "shuttle-idle";
+ break
+ case 2://浣滀笟涓�
+ shuttleStatusClass = "shuttle-working";
+ break
+ case 3://绛夊緟纭
+ shuttleStatusClass = "shuttle-waiting";
+ break
+ case 4://鍏呯數涓�
+ shuttleStatusClass = "shuttle-charging";
+ break
+ case 5://鍏呯數浠诲姟绛夊緟纭
+ shuttleStatusClass = "shuttle-charging-waiting";
+ break
+ case 6://鏁呴殰淇涓�
+ shuttleStatusClass = "shuttle-fixing";
+ break
+ case 7://绂荤嚎
+ shuttleStatusClass = "shuttle-offline";
+ break
+ default:
+ shuttleStatusClass = "shuttle-idle"
+ }
+ let shuttleStatus = '<div class="state">' +
+ '<span>鍥涘悜绌挎杞� ' + item.shuttleNo + '</span>' +
+ '<span class="state-ss ' + shuttleStatusClass + '">' + item.status$ + '</span></div>';
+ $("#shuttle-status-box").append(shuttleStatus)
+
if(item.locNoLev != currentLev){
//鍥涘悜绌挎杞︽ゼ灞傚拰褰撳墠鍦板浘妤煎眰涓嶄竴鑷达紝鍒犻櫎璇ヨ溅杈�
$("#sxcar-" + item.shuttleNo).remove()
@@ -463,7 +527,7 @@
$("#mapDataId").empty()
$.ajax({
type:"get",
- url: baseUrl + "/static/js/map.json",
+ url: baseUrl + "/static/js/map_" + lev + ".json",
success: (data) => {
mapData = data
let content = ""
@@ -489,18 +553,12 @@
break;
case 4:
//绔欑偣
- if (lev == 1) {
- let data = colData.data;
- col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
- }else {
- //鍏朵粬妤煎眰鍙湁鎻愬崌鏈鸿兘鏄剧ず
- let data = colData.data;
- if (data == 109) {//鍏朵粬妤煎眰鍙湁鎻愬崌鏈鸿兘鏄剧ず
- col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
- }else {
- col = '<div style="visibility: hidden" id="site-' + data + '" class="site">' + data + '(9991)</div>';
- }
- }
+ var data = colData.data;
+ col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
+ break;
+ case 5:
+ //鍏呯數妗�
+ col = '<button class="item" style="font-size: 24px">⚡</button>';
break;
default:
col = '<button class="item">' + idx + '</button>';
@@ -860,11 +918,11 @@
success: function (res) {
if (res.code === 200){
if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
+ $('#system-toggle-checked').attr("checked", true);
$('#system-run-desc').html("绯荤粺杩愯涓�...");
parent.systemRunning = true;
} else {
- $('#system-icon').attr("class", "system-icon-close");
+ $('#system-toggle-checked').attr("checked", false);
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
parent.systemRunning = false;
}
@@ -973,34 +1031,6 @@
}
}
});
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal+'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal+'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal+'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal+'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal+'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
}
// 灏忚溅鍋忕Щ鍔ㄧ敾
--
Gitblit v1.9.1