From f27968397dd2d37add528bf7937ebd6905762a09 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 15:11:08 +0800
Subject: [PATCH] 穿梭车、提升机、主控界面优化
---
src/main/webapp/views/console.html | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e603912..bc7bfd1 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -5,6 +5,7 @@
<title>WCS鎺у埗涓績</title>
<link rel="stylesheet" href="../static/css/console.css">
<link rel="stylesheet" href="../static/css/animate.min.css">
+ <link rel="stylesheet" href="../static/css/toggle-switch.css">
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script src="../static/js/layer/layer.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
@@ -38,35 +39,56 @@
<div class="system-state">
<div class="body-head">鎬诲紑鍏�</div>
<div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+ <label id="system-toggle" class="toggle-switch" style="margin-left: 20px;">
+ <input id="system-toggle-checked" checked="checked" type="checkbox">
+ <div class="button">
+ <div class="light"></div>
+ <div class="dots"></div>
+ <div class="characters"></div>
+ <div class="shine"></div>
+ <div class="shadow"></div>
+ </div>
+ </label>
+
<div class="switch_r">
<p>绯荤粺鐘舵��</p>
<p id="system-run-desc">绯荤粺杩愯涓�</p>
</div>
</div>
</div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
+ <!-- 鍥涘悜绌挎杞︾姸鎬� -->
+ <div class="line-status">
+ <div class="body-head">绌挎杞︾姸鎬�</div>
<div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
+ <span>鍥涘悜绌挎杞� 1</span>
+ <span class="state-ss shuttle-idle">绌洪棽</span>
</div>
-<!-- <div class="state">-->
-<!-- <span>鍫嗗灈鏈� 2</span>-->
-<!-- <span class="state-ss machine-auto-flag ">鑷姩</span>-->
-
-<!-- </div>-->
+ <div class="state">
+ <span>鍥涘悜绌挎杞� 2</span>
+ <span class="state-ss shuttle-idle">绌洪棽</span>
+ </div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
- <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-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+ <span class="shuttle-idle">绌洪棽</span>
+ <span class="shuttle-working">浣滀笟涓�</span>
+ <span class="shuttle-waiting">绛夊緟纭</span>
+ <span class="shuttle-charging">鍏呯數涓�</span>
+ <span class="shuttle-charging-waiting">鍏呯數浠诲姟绛夊緟纭</span>
+ <span class="shuttle-fixing">鏁呴殰淇涓�</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>
+ <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>
</div>
</div>
<!-- 杈撻�佺嚎鐘舵�� -->
@@ -101,14 +123,6 @@
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
<div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
</div>
</div>
@@ -758,7 +772,6 @@
})
-
var crn1Position = 0;
var crn2Position = 0;
var crn3Position = 0;
@@ -781,6 +794,12 @@
setInterval(function () {
getSitesInfo();
}, 3000);
+
+ $("#system-toggle").on("click",(e) => {
+ systemSwitch()
+ e.stopPropagation();//琛ㄧず闃绘鍚戠埗鍏冪礌鍐掓场
+ e.preventDefault();//闃绘 鏂规硶闃绘鍏冪礌鍙戠敓榛樿鐨勮涓猴紙渚嬪锛屽綋鐐瑰嚮鎻愪氦鎸夐挳鏃堕樆姝㈠琛ㄥ崟鐨勬彁浜ゆ垨鑰卆鏍囩锛夈��
+ })
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
@@ -813,11 +832,11 @@
layer.close(index);
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;
}
--
Gitblit v1.9.1