From ae0f47d70a1a4d539bf7cb0d69e0375d91ef3f7c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 13:18:56 +0800
Subject: [PATCH] #入库任务BUG修复
---
src/main/webapp/views/console.html | 1121 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 613 insertions(+), 508 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index cd971a3..1a066b7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1,56 +1,59 @@
<!DOCTYPE html>
<html lang="en">
-<!--5灞� 28鍒� 1120搴撲綅-->
<head>
<meta charset="UTF-8">
- <title>WCS鎺у埗涓績</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="../static/css/common.css">
- <link rel="stylesheet" type="text/css" href="../static/css/console.css">
- <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/layer/layer.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <style>
- /* layer 娣辫摑鑹叉寜閽慨鏀� */
- /*.layui-layer-lan .layui-layer-btn {*/
- /*border-top: none;*/
- /*}*/
- .layui-layer-lan .layui-layer-btn a {
- background: #4476A7;
- border-color: #4476A7;
- color: #fff;
- }
- .layui-layer-lan .layui-layer-btn .layui-layer-btn1 {
- background: #fff;
- color: #333;
- border-color: #E9E7E7;
- }
- .layui-layer-lan .layui-layer-btn .layui-layer-btn1:hover {
- background-color: #f7f7f7;
- }
- </style>
+ <title>鑷姩浠撳簱wcs绯荤粺</title>
+ <link rel="stylesheet" href="../static/css/render.css">
+ <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script src="../static/js/layer/layer.js"></script>
+ <!--鍦板浘json-->
+ <script src="../static/js/console.map.js"></script>
+ <script src="../static/js/console.js"></script>
+ <script src="../static/js/common.js"></script>
+
+
</head>
<body>
-<header>
- <!-- 绯荤粺杩愯鐘舵�� -->
- <div class="system-state">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <span id="system-run-desc">绯荤粺杩愯涓�...</span>
- </div>
+ <div id="main">
+ <div class="head">
+ <div class="head-left">
+ <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+ <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ </div>
+ <div class="head-right">
+<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
+ </div>
+ </div>
+ <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
+ <div class="main-part">
- <!-- 淇℃伅灞曠ず -->
- <div class="data-window">
- <!-- 鏍囬 -->
- <h1>鑷姩浠撳簱 WCS 鐩戞帶鍥�</h1>
+ </div>
+ <div id="body">
+ <!-- 鎬诲紑鍏� -->
+ <div class="system-state">
+ <div class="body-head">鎬诲紑鍏�</div>
+ <div class="switch">
+ <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+ <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="state">
+ <span>鍫嗗灈鏈� 1</span>
+ <span class="state-ss machine-put-flag ">鍏ュ簱</span>
+ </div>
+ <div class="state">
+ <span>鍫嗗灈鏈� 2</span>
+ <span class="state-ss machine-auto-flag ">鑷姩</span>
- <!-- 棰滆壊鎻愮ず -->
- <div class="tips">
- <div class="tips-item">
- <label>鍫嗗灈鏈虹姸鎬侀鑹�: </label>
- <div class="item-group">
+ </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>
@@ -61,9 +64,14 @@
<span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
</div>
</div>
- <div class="tips-item">
- <label>杈撻�佽澶囩姸鎬侀鑹�: </label>
- <div class="item-group">
+ <div class="line-status">
+ <div class="body-head">杈撻�佺嚎鐘舵��</div>
+ <div class="state states">
+ <span>杩愯緭绾挎�绘暟</span>
+ <span id="line-total" class="line-ss"></span>
+ </div>
+ <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+ <div class="button item-group">
<span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
<span class="site-auto-run">鑷姩+鏈夌墿</span>
<span class="site-auto-id">鑷姩+ID</span>
@@ -71,347 +79,397 @@
<span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
</div>
</div>
+ <div class="bar-code">
+ <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div id="barcode1" class="table-body">
+
+ </div>
+ </div>
+ <div class="tablebox">
+ <div class="table-head">
+ <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>
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈哄脊绐� -->
+ <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
+ <div id="crnWindow-head">
+ <div class='detailed'></div>
+ <button></button>
+ </div>
+ <form>
+ <!-- 鍫嗗灈鏈哄彿 -->
+ <div class="form-item">
+ <div class="form-item-label" style>
+ <span>鍫嗗灈鏈哄彿锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="">
+ </div>
+ </div>
+ <!-- 绔欐簮 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>绔欐簮锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣绔� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣绔欙細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵�侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="wrkSts" value="">
+ </div>
+ </div>
+ <!-- 鍑哄叆绫诲瀷 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="">
+ </div>
+ </div>
+ <!-- 婧愬簱浣� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愬簱浣嶏細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceLocNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣搴撲綅 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="locNo" value="">
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍫嗗灈鏈虹姸鎬侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnStatus" value="">
+ </div>
+ </div>
+ <!-- 寮傚父 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>寮傚父锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="error" value="">
+ </div>
+ </div>
+ </form>
+ </div>
+ <!-- 杈撻�佽澶囧脊绐� -->
+ <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
+ <!-- 琛ㄥご -->
+ <div id="siteWindow-head">
+ <div class='detailed'></div>
+ <button></button>
+ </div>
+ <form>
+ <!-- 璁惧鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>璁惧鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="siteId" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鍙� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙凤細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="">
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵�侊細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="wrkSts" value="">
+ </div>
+ </div>
+ <!-- 鑷姩 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑷姩</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="autoing">
+ </div>
+ </div>
+ <!-- 鏈夌墿 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鏈夌墿</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="loading">
+ </div>
+ </div>
+ <!-- 鑳藉叆 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑳藉叆</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="canining">
+ </div>
+ </div>
+ <!-- 鑳藉嚭 -->
+ <div class="form-item-checkbox">
+ <div class="form-item-label-checkbox">
+ <span>鑳藉嚭</span>
+ </div>
+ <div class="form-item-input-checkbox">
+ <input type="checkbox" name="canouting">
+ </div>
+ </div>
+ <!-- 鍑哄叆绫诲瀷 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="">
+ </div>
+ </div>
+ <!-- 婧愮珯 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愮珯锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣绔� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣绔欙細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="">
+ </div>
+ </div>
+ <!-- 婧愬簱浣� -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>婧愬簱浣嶏細</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceLocNo" value="">
+ </div>
+ </div>
+ <!-- 鐩爣搴撲綅 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="locNo" value="">
+ </div>
+ </div>
+
+ </form>
</div>
</div>
-</header>
-<main>
-
- <!----------- 宸ュ叿鏍� ---------->
- <!-- 鍏ュ簱鍙� -->
- <div class="cargo-put"></div>
- <!-- 鎵爜鍣� -->
- <div id="code-decoder-1" class="code-decoder">
- <span id="code-decoder-data-1" class="code-decoder-data">0</span>
- </div>
-
-
- <!----------- 宸﹁緭閫佺嚎 ---------->
-
- <!-- 鍙拌溅杞ㄩ亾 -->
- <div id="car-track-1" class="car-track"></div>
-
- <!-- 鍙拌溅瀹炰緥 -->
- <div id="site-8" class="site car">8</div>
-
- <!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
- <div class="site-row site-row-1">
- <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
- <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
- <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
- <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
- <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
- </div>
-
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
- <div class="main-part">
- <!--绗竴鎺�-->
- <div class="lane">
- <span class="row-no">1#</span>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div id="site-6" class="site" style="">6</div>
- <button class="item">1</button>
- <button class="item">2</button>
- <button class="item">3</button>
- <button class="item">4</button>
- <button class="item">5</button>
- <button class="item">6</button>
- <button class="item">7</button>
- <button class="item">8</button>
- <button class="item">9</button>
- <button class="item">10</button>
- <button class="item">11</button>
- <button class="item">12</button>
- <button class="item">13</button>
- <button class="item">14</button>
- <button class="item">15</button>
- <button class="item">16</button>
- <button class="item">17</button>
- <button class="item">18</button>
- <button class="item">19</button>
- <button class="item">20</button>
- <button class="item">21</button>
- <button class="item">22</button>
- <button class="item">23</button>
- <button class="item">24</button>
- <button class="item">25</button>
- <button class="item">26</button>
- <button class="item">27</button>
- <button class="item">28</button>
- <button class="item">29</button>
- <button class="item">30</button>
- <button class="item">31</button>
- <button class="item">32</button>
- <button class="item">33</button>
- <button class="item">34</button>
- <div class="site site-none"> </div>
- </div>
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn-1" class="machine"></div>
- </div>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div id="site-5" class="site" style="">5</div>
- <button class="item">1</button>
- <button class="item">2</button>
- <button class="item">3</button>
- <button class="item">4</button>
- <button class="item">5</button>
- <button class="item">6</button>
- <button class="item">7</button>
- <button class="item">8</button>
- <button class="item">9</button>
- <button class="item">10</button>
- <button class="item">11</button>
- <button class="item">12</button>
- <button class="item">13</button>
- <button class="item">14</button>
- <button class="item">15</button>
- <button class="item">16</button>
- <button class="item">17</button>
- <button class="item">18</button>
- <button class="item">19</button>
- <button class="item">20</button>
- <button class="item">21</button>
- <button class="item">22</button>
- <button class="item">23</button>
- <button class="item">24</button>
- <button class="item">25</button>
- <button class="item">26</button>
- <button class="item">27</button>
- <button class="item">28</button>
- <button class="item">29</button>
- <button class="item">30</button>
- <button class="item">31</button>
- <button class="item">32</button>
- <button class="item">33</button>
- <button class="item">34</button>
- <div class="site site-none"> </div>
- </div>
- <span class="row-no">2#</span>
- </div>
- </div>
-</main>
-
-<!-- 寮圭獥 -->
-<!-- 杈撻�佽澶囧脊绐� -->
-<div id="siteWindow" style="display: none">
- <form>
- <!-- 绗竴琛� -->
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>璁惧鍙�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>宸ヤ綔鍙�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
- <div class="form-item" style="width: 45%">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵��</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
- </div>
- </div>
-
- <!-- 绗簩琛� -->
- <div class="form-item" style="width: 20%">
- <div class="form-item-label">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input">
- <input type="checkbox" name="autoing" disabled="disabled" style="width: 1rem">
- </div>
- </div>
- <div class="form-item" style="width: 20%">
- <div class="form-item-label">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input">
- <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem">
- </div>
- </div>
- <div class="form-item" style="width: 20%">
- <div class="form-item-label">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input">
- <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
- </div>
- </div>
- <div class="form-item" style="width: 20%">
- <div class="form-item-label">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input">
- <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
- </div>
- </div>
-
- <!-- 绗笁琛� -->
- <div class="form-item" style="width: 40%">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="" disabled="disabled" style="width: 8rem">
- </div>
- </div>
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>婧愮珯</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>鐩爣绔�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
-
- <!-- 绗洓琛� -->
- <div class="form-item" style="width: 40%">
- <div class="form-item-label">
- <span>婧愬簱浣�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
- </div>
- </div>
- <div class="form-item" style="width: 40%">
- <div class="form-item-label">
- <span>鐩爣搴撲綅</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
- </div>
- </div>
- </form>
-</div>
-
-<!-- 鍫嗗灈鏈哄脊绐� -->
-<div id="crnWindow" style="display: none">
- <form>
- <!-- 绗竴琛� -->
- <div class="form-item" style="width: 23%">
- <div class="form-item-label" style="width: 87px">
- <span>鍫嗗灈鏈哄彿</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="" disabled="disabled" style="width: 3rem">
- </div>
- </div>
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>宸ヤ綔鍙�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="" disabled="disabled" style="width: 5rem">
- </div>
- </div>
- <div class="form-item" style="width: 23%">
- <div class="form-item-label">
- <span>婧愮珯</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
- <div class="form-item" style="width: 25%">
- <div class="form-item-label">
- <span>鐩爣绔�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
- </div>
- </div>
-
- <!-- 绗簩琛� -->
- <div class="form-item" style="width: 45%">
- <div class="form-item-label" style="width: 87px">
- <span>宸ヤ綔鐘舵��</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
- </div>
- </div>
- <div class="form-item" style="width: 45%">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="" disabled="disabled" style="width: 10rem">
- </div>
- </div>
-
- <!-- 绗笁琛� -->
- <div class="form-item" style="width: 45%">
- <div class="form-item-label" style="width: 87px">
- <span>婧愬簱浣�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
- </div>
- </div>
- <div class="form-item" style="width: 45%">
- <div class="form-item-label">
- <span>鐩爣搴撲綅</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
- </div>
- </div>
-
- <!-- 绗洓琛� -->
- <div class="form-item" style="width: 95%">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" disabled="disabled" style="width: 25rem">
- </div>
- </div>
- <div class="form-item" style="width: 95%">
- <div class="form-item-label" style="width: 87px">
- <span>寮傚父</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" disabled="disabled" style="width: 25rem">
- </div>
- </div>
- </form>
-</div>
</body>
+
+</html>
<script>
+ getMap();
+</script>
+<script>
+ setInterval(function () {
+ getCodeData();
+ renderBarCode();
+ }, 1000)
+ var tData = [],tData1 = [],tData2 = [],tData3 = [];
+ function getCodeData() {
+ $.ajax({
+ url: baseUrl + '/console/barcode/output/site',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ tData = eval(res.data);
+ if (tData.length <= 5) {
+ tData1 = tData
+ } else if (tData.length <= 10) {
+ tData1 = tData.slice(0, 5)
+ tData.splice(0, 5)
+ tData2 = tData
+ } else if (tData.length <= 15) {
+ tData1 = tData.slice(0, 5)
+ tData2 = tData.slice(6, 10)
+ tData.splice(0, 10)
+ tData3 = tData
+ } else {
+ tData = tData.slice(-15)
+ tData1 = tData.slice(-15)
+ tData2 = tData.slice(-10)
+ tData3 = tData.slice(-5)
+ }
+ }
+ }
+ })
+ }
+ function renderBarCode() {
+ for (var i = 0; i < tData1.length; i++) {
+ var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
+ $('#barcode1').append(str1)
+ }
+ for (var j = 0; j < tData2.length; j++) {
+ var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
+ $('#barcode2').append(str2)
+ }
+ for (var k = 0; k < tData3.length; k++) {
+ var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
+ $('#barcode3').append(str3)
+ }
+ }
+</script>
+<script type="text/javascript">
+ // 寮圭獥绔欑偣淇℃伅
+ $('.site').on('click', function () {
+ var id = this.id.split("-")[1];
+ $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
+ $("#crnWindow").attr("style", "display:none;");
+ $(".detailed").empty();
+ $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
+ $.ajax({
+ url: baseUrl + "/console/site/detail",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ siteId: id
+ },
+ method: 'post',
+ success: function (res) {
+ for (var val in res.data) {
+ var find = $("#siteWindow").find(":input[name='" + val + "']");
+ if (find[0].type === 'text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
+ }
+ }
+
+ })
+
+ });
+ // 鍫嗗灈鏈轰俊鎭�
+ $('.machine').on('click', function () {
+ var id = this.id.split("-")[1];
+ $("#crnWindow").attr('style', 'display:block;');
+ $("#siteWindow").attr("style", "display:none;");
+ $('.detailed').empty();
+ $('.detailed').append(id + '鍙峰爢鍨涙満');
+ $.ajax({
+ url: baseUrl + "/console/crn/detail",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ crnNo: id
+ },
+ method: 'post',
+ success: function (res) {
+ for (var val in res.data) {
+ var find = $("#crnWindow").find(":input[name='" + val + "']");
+ if (find[0].type === 'text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
+ }
+ }
+
+ })
+
+ })
+ // 寮圭獥鍏抽棴
+ $('button').on('click', function () {
+ $('#siteWindow').attr('style', 'display:none')
+ $('#crnWindow').attr('style', 'display:none')
+ })
+
+
var crn1Position = 0;
var crn2Position = 0;
+ var crn3Position = 0;
+ var crn4Position = 0;
+ var crn5Position = 0;
+
// 鍒濆鍖�
getSitesInfo();
getCrnInfo();
getSystemRunningStatus();
getBarcodeInfo();
+ getScaleInfo();
+ // carAnimate();
+ carAnimate2();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
- getBarcodeInfo()
+ getBarcodeInfo();
+ getScaleInfo();
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -419,8 +477,8 @@
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (parent.systemRunning){
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
+ if (parent.systemRunning) {
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
layer.close(idx);
doSwitch(0, pass); // 鍋滄wcs绯荤粺
});
@@ -433,10 +491,10 @@
function doSwitch(operatorType, password) {
// 鍔犺浇tips
var index = layer.load(1, {
- shade: [0.1,'#fff']
+ shade: [0.1, '#fff']
});
$.ajax({
- url: baseUrl+ "/console/system/switch",
+ url: baseUrl + "/console/system/switch",
headers: {'token': localStorage.getItem('token')},
// async: false,
data: {
@@ -446,7 +504,7 @@
method: 'POST',
success: function (res) {
layer.close(index);
- if (res.code === 200){
+ if (res.code === 200) {
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
@@ -456,10 +514,11 @@
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
parent.systemRunning = false;
}
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -469,11 +528,11 @@
// 鑾峰彇wcs绯荤粺杩愯鐘舵��
function getSystemRunningStatus() {
$.ajax({
- url: baseUrl+ "/console/system/running/status",
+ url: baseUrl + "/console/system/running/status",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
@@ -483,82 +542,130 @@
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
parent.systemRunning = false;
}
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- alert(res.msg);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
}
}
});
}
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo(){
+ function getSitesInfo() {
$.ajax({
- url: baseUrl+ "/console/latest/data/site",
+ url: baseUrl + "/console/latest/data/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
var sites = res.data;
- for (var i = 0; i < sites.length; i++){
- var siteEl = $("#site-"+sites[i].siteId);
+ for (var i = 0; i < sites.length; i++) {
+ var siteEl = $("#site-" + sites[i].siteId);
+ console.log(sites[i].siteId)
siteEl.attr("class", "site " + sites[i].siteStatus);
- if (sites[i].workNo != null && sites[i].workNo>0) {
+ // siteEl.attr("class", "site site-auto-run-id");
+ if (sites[i].workNo != null && sites[i].workNo > 0) {
siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
} else {
siteEl.html(sites[i].siteId);
}
+
+ if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
+ carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
+ }
}
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- alert(res.msg);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
}
}
});
}
// 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo(){
+ function getCrnInfo() {
$.ajax({
- url: baseUrl+ "/console/latest/data/crn",
+ url: baseUrl + "/console/latest/data/crn",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ // console.log(res)
+ if (res.code === 200) {
var crns = res.data;
- for (var i = 0; i < crns.length; i++){
- var crnEl = $("#crn-"+crns[i].crnId);
+ for (var i = 0; i < crns.length; i++) {
+ var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- // crnAnimate(crns[i].crnId, crns[i].offset);
- crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
+ var unit = 0;//($('.item').eq(0).width() + 13) / 2;
+
+ if (crns[i].bay < 0 || crns[i].bay === -2) {
+ crns[i].bay = 1
+ }
+ // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
+ // crns[i].bay = 15;
+
+ var offSet = 0;
+ unit = 60;
+ offSet = 325;
+
+
+ if(crns[i].bay === 1){
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ }
+
}
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- alert(res.msg);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
}
}
});
}
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo(){
+ function getBarcodeInfo() {
$.ajax({
- url: baseUrl+ "/console/latest/data/barcode",
+ url: baseUrl + "/console/latest/data/barcode",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++){
- $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ for (var i = 0; i < barcodes.length; i++) {
+ $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
}
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- alert(res.msg);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
+ // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
+ function getScaleInfo() {
+ $.ajax({
+ url: baseUrl + "/console/latest/data/scale",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+
+ if (res.code === 200) {
+ var sclaes = res.data;
+ for (var i = 0; i < sclaes.length; i++) {
+ console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
+ $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
+ }
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
}
}
});
@@ -566,107 +673,68 @@
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
+ // console.log(crn1Position)
switch (id) {
case 1:
- $("#crn-1").animate({left: leftVal+'px'}, 1000);
+ $("#crn-1").animate({left: leftVal + 'px'}, 1000);
crn1Position = leftVal;
break;
case 2:
- $("#crn-2").animate({left: leftVal+'px'}, 1000);
+ $("#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
}
}
- // 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
-
- // 杈撻�佽澶囩偣鍑讳簨浠�
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- if (id === undefined) {
- return;
- }
- layer.open({
- title: id + " 绔欑偣淇℃伅璇︽儏",
- closeBtn: 0,
- skin: 'layui-layer-lan',
- offset: '180px',
- type: 1,
- shadeClose: true,
- content: $('#siteWindow'),
- area: ['35rem', '18rem'],
- btn: ['纭畾', '鍏抽棴'],
- success: function(layero, index){
- http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- })
- },
- end: function () {
- $(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
- }
- });
- });
-
- // 鍫嗗灈鏈虹偣鍑讳簨浠�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- layer.open({
- title: id+"鍙峰爢鍨涙満",
- skin: 'layui-layer-lan',
- closeBtn: 0,
- type: 1,
- offset: '150px',
- shadeClose: true,
- content: $("#crnWindow"),
- area: ['40rem', '20rem'],
- btn: ['纭畾', '鍏抽棴'],
- success: function(layero, index){
- http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- })
- },
- end: function () {
- $(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
- }
- });
- });
-
-
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 8) {
+ // debugger
+ var targetTop = 0;
+ if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 827;
break;
case 2:
- targetTop += 120;
+ targetTop += 765;
break;
case 3:
- targetTop += 80;
+ targetTop += 651;
break;
case 4:
- targetTop += 40;
+ targetTop += 589;
+ break;
+ case 5:
+ targetTop += 505;
+ break;
+ case 6:
+ targetTop += 443;
break;
case 7:
- targetTop += 0;
+ targetTop += 362;
+ break;
+ case 8:
+ targetTop += 297;
+ break;
+ case 9:
+ targetTop += 243;
+ break;
+ case 10:
+ targetTop += 129;
break;
default:
return;
@@ -674,21 +742,58 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop+'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
+ //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
+ let sitePosition = {
+ 101: '68px',
+ 102: '117px',
+ 122: '183px',
+ 104: '183px',
+ 105: '232px',
+ 118: '297px',
+ 107: '297px',
+ 108: '345px',
+ 119: '355px',
+ 110: '410px',
+ 120: '421px',
+ 111: '459px',
+ 121: '479px',
+ 113: '524px',
+ 123: '556px',
+ 114: '572px',
+ 1142: '600px',
+ 116: '639px',
+ 117: '687px',
+ }
- // 鍙拌溅鐐瑰嚮浜嬩欢
- $(document).on("click", ".item", function () {
- var value = prompt('鐩爣绔欙細', "1");
- if (value == null) {
- alert('涓嶈兘涓虹┖锛�');
- } else if (value === '') {
- alert('涓嶈兘涓虹┖锛�');
- } else {
- carAnimate(8, Number(value));
- }
- })
+ //RGV杞︾Щ鍔ㄥ姩鐢�
+ function moveSite(siteId, staNo) {
+ $(siteId).animate({top: sitePosition[staNo]}, 1000);
+ }
-</script>
-</html>
\ No newline at end of file
+ // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
+
+ // Rgv瀹炴椂鏁版嵁鑾峰彇
+ function carAnimate2() {
+ // console.log("1=============1")
+ $.ajax({
+ url: baseUrl + "/rgv/console/rgv/site/data",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var rgvMap = res.data;
+ for (var i = 0; i < rgvMap.length; i++) {
+ moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
+ }
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
--
Gitblit v1.9.1