From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 727 +++++++++++++++++++++++++------------------------------
1 files changed, 335 insertions(+), 392 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 70d8723..898b7fd 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -11,12 +11,12 @@
<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/common.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;*/
+ /*border-top: none;*/
/*}*/
.layui-layer-lan .layui-layer-btn a {
background: #4476A7;
@@ -51,14 +51,14 @@
<div class="tips-item">
<label>鍫嗗灈鏈虹姸鎬侀鑹�: </label>
<div class="item-group">
- <span class="machine-put">鍏ュ簱</span>
- <span class="machine-take">鍑哄簱</span>
- <span class="machine-stock-move">搴撳埌搴�</span>
- <span class="machine-site-move">绔欏埌绔�</span>
- <span class="machine-p-move">PToP</span>
- <span class="machine-error">寮傚父</span>
- <span class="machine-auto">鑷姩</span>
- <span class="machine-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <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>
</div>
</div>
<div class="tips-item">
@@ -83,333 +83,201 @@
<div id="code-decoder-1" class="code-decoder">
<span id="code-decoder-data-1" class="code-decoder-data">0</span>
</div>
-
-
- <!-- 宸﹁緭閫佺嚎 -->
- <!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
- <div class="site-row site-row-1">
- <div id="site-1" class="site" style="width: 80px; height: 50px;line-height: 50px">1[9999]</div>
- <div id="site-2" class="site" >2</div>
- <div id="site-3" class="site" style="width: 80px; height: 30px;line-height: 30px">3</div>
- <div id="site-4" class="site" style="width: 80px; height: 60px;line-height: 60px">4</div>
- <div id="site-5" class="site" style="width: 80px; height: 50px;line-height: 50px">5</div>
- <div id="site-6" class="site" >6</div>
- <div id="site-7" class="site" style="width: 80px; height: 68px;line-height: 68px">7</div>
- <div id="site-8" class="site" style="width: 80px; height: 42px;line-height: 40px">8</div>
- <div id="site-9" class="site" >9</div>
+ <!-- 鎵爜鍣� -->
+ <div id="code-decoder-2" class="code-decoder">
+ <span id="code-decoder-data-2" class="code-decoder-data">0</span>
</div>
+
+
+ <!----------- 宸﹁緭閫佺嚎 ---------->
+
+ <!-- 鍙拌溅杞ㄩ亾 -->
+ <div id="car-track-1" class="car-track">
+ <div></div>
+ </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: 20px;line-height: 20px;margin-bottom: 20px">7</div>
+ <div id="site-4" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">4</div>
+ <div id="site-3" class="site" style="height: 20px;line-height: 20px;margin-bottom: 40px">3</div>
+ <div id="site-2" class="site" style="height: 20px;line-height: 20px;margin-bottom: 0px">2</div>
+ <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
+ </div>
+
<!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-2">
- <div id="site-32" class="site" style="width: 80px; height: 50px;line-height: 50px">32</div>
- <div id="site-31" class="site" >31</div>
- <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px;">30</div>
- <div id="site-23" class="site" >23</div>
- <div id="site-22" class="site" style="width: 80px; height: 50px;line-height: 50px">22</div>
- <div id="site-20" class="site" >20</div>
- <div id="site-19" class="site" style="width: 80px;">19</div>
- <div id="site-17" class="site" >17</div>
- <div id="site-16" class="site" style="width: 80px; height: 35px;line-height: 35px">16</div>
- <div id="site-15" class="site" style="width: 80px; height: 35px;line-height: 35px">15</div>
- <div id="site-13" class="site" >13</div>
- <div id="site-12" class="site" style="width: 80px;">12</div>
- <div id="site-10" class="site" >10</div>
+ <div id="site-103" class="site" style="height: 20px;line-height: 20px">103</div>
+ <div id="site-104" class="site" style="height: 20px;line-height: 20px">104</div>
+ <div id="site-105" class="site" style="height: 20px;line-height: 20px">105</div>
</div>
- <!-- 绗笁鍒楋紙瀹藉害 100px锛�-->
+
+ <!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-3">
- <div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
- <div id="site-29" class="site" style="width: 50px;">29</div>
- <div id="site-28" class="site" style="width: 50px;">28</div>
- <div class="site-none" style="width: 80px; height: 50px;line-height: 30px"></div>
- <div id="site-24" class="site" >24</div>
- </div>
- <!-- 绗洓鍒楋紙瀹藉害 100px锛�-->
- <div class="site-row site-row-4">
- <div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
- <div id="site-27" class="site" >27</div>
- <div id="site-26" class="site" style="width: 80px; height: 30px;line-height: 30px">26</div>
- <div id="site-25" class="site" >25</div>
+ <div id="site-102" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">102</div>
+ <div id="site-106" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">106</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<div class="main-part">
- <!--绗簩鎺�-->
+ <!--绗竴缁�-->
<div class="lane">
- <span class="row-no">2#</span>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div class="site site-none"> </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>
- <div class="site site-none"> </div>
- </div>
- <div class="stock-group">
- <div id="site-21" class="site">21</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>
- <div class="site site-none"> </div>
- </div>
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn1" class="machine"></div>
- </div>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div id="site-18" class="site">18</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>
- <div class="site site-none"> </div>
- </div>
- <div class="stock-group">
- <div class="site site-none"> </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>
- <div class="site site-none"> </div>
- </div>
- </div>
-
- <!--绗竴鎺�-->
- <div class="lane">
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div class="site site-none"> </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>
- <div class="site site-none"> </div>
- </div>
- <div class="stock-group">
- <div id="site-14" class="site">14</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>
- <div class="site site-none"> </div>
- </div>
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn2" class="machine"></div>
- </div>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div id="site-11" class="site">11</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>
- <div class="site site-none"> </div>
- </div>
- <div class="stock-group">
- <div class="site site-none"> </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>
- <div class="site site-none"> </div>
- </div>
<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 class="lane" style="margin-left: 300px">
+ <span class="row-no">3#</span>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-101" class="site" style="">101</div>
+ <button class="item">2</button>
+ <button class="item">4</button>
+ <button class="item">6</button>
+ <button class="item">8</button>
+ <button class="item">10</button>
+ <button class="item">12</button>
+ <button class="item">14</button>
+ <button class="item">16</button>
+ <button class="item">18</button>
+ <button class="item">20</button>
+ <button class="item">22</button>
+ <button class="item">24</button>
+ <button class="item">26</button>
+ <button class="item">28</button>
+ <button class="item">30</button>
+ <button class="item">32</button>
+ <button class="item">34</button>
+ <button class="item">36</button>
+ <button class="item">38</button>
+ <button class="item">40</button>
+ <button class="item">42</button>
+ <button class="item">44</button>
+ <button class="item">46</button>
+ <button class="item">48</button>
+ <div class="site site-none"> </div>
+ </div>
+ <!-- 鍫嗗灈鏈� -->
+ <div class="crn">
+ <hr class="pathway" style="width: 67.5%">
+ <div id="crn-2" class="machine"></div>
+ </div>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-107" class="site" style="">107</div>
+ <button class="item">2</button>
+ <button class="item">4</button>
+ <button class="item">6</button>
+ <button class="item">8</button>
+ <button class="item">10</button>
+ <button class="item">12</button>
+ <button class="item">14</button>
+ <button class="item">16</button>
+ <button class="item">18</button>
+ <button class="item">20</button>
+ <button class="item">22</button>
+ <button class="item">24</button>
+ <button class="item">26</button>
+ <button class="item">28</button>
+ <button class="item">30</button>
+ <button class="item">32</button>
+ <button class="item">34</button>
+ <button class="item">36</button>
+ <button class="item">38</button>
+ <button class="item">40</button>
+ <button class="item">42</button>
+ <button class="item">44</button>
+ <button class="item">46</button>
+ <button class="item">48</button>
+ <div class="site site-none"> </div>
+ </div>
+ <span class="row-no">4#</span>
</div>
</div>
</main>
@@ -424,7 +292,7 @@
<span>璁惧鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="devpNo" value="12" disabled="disabled" style="width: 4rem">
+ <input type="text" name="siteId" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -432,7 +300,7 @@
<span>宸ヤ綔鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 4rem">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -440,7 +308,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -450,7 +318,7 @@
<span>鑷姩</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="auto" disabled="disabled" style="width: 1rem" checked>
+ <input type="checkbox" name="autoing" disabled="disabled" style="width: 1rem">
</div>
</div>
<div class="form-item" style="width: 20%">
@@ -458,24 +326,24 @@
<span>鏈夌墿</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem" checked>
+ <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" checked>
- </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" checked>
- </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>
<!-- 绗笁琛� -->
@@ -484,7 +352,7 @@
<span>鍑哄叆绫诲瀷</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 8rem">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -492,7 +360,7 @@
<span>婧愮珯</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -500,7 +368,7 @@
<span>鐩爣绔�</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
@@ -510,7 +378,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
<div class="form-item" style="width: 40%">
@@ -518,7 +386,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" style="width: 8rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
</form>
@@ -533,7 +401,7 @@
<span>鍫嗗灈鏈哄彿</span>
</div>
<div class="form-item-input">
- <input type="text" name="crnNo" value="12" disabled="disabled" style="width: 3rem">
+ <input type="text" name="crnNo" value="" disabled="disabled" style="width: 3rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -541,7 +409,7 @@
<span>宸ヤ綔鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 5rem">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 5rem">
</div>
</div>
<div class="form-item" style="width: 23%">
@@ -549,7 +417,7 @@
<span>婧愮珯</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -557,7 +425,7 @@
<span>鐩爣绔�</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
@@ -567,7 +435,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -575,7 +443,7 @@
<span>鍑哄叆绫诲瀷</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 10rem">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -585,7 +453,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -593,7 +461,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -619,33 +487,33 @@
</body>
<script>
- var systemRunning = true;
var crn1Position = 0;
var crn2Position = 0;
// 鍒濆鍖�
getSitesInfo();
getCrnInfo();
getSystemRunningStatus();
+ getBarcodeInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
- }, 500);
+ getBarcodeInfo()
+ }, 1000);
setInterval(function () {
getSitesInfo();
}, 3000);
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (systemRunning){
+ if (parent.systemRunning){
layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
- doSwitch(0, pass);
+ doSwitch(0, pass); // 鍋滄wcs绯荤粺
});
} else {
- doSwitch(1)
+ doSwitch(1); // 鍚姩wcs绯荤粺
}
-
}
// 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
@@ -669,16 +537,17 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
+ parent.systemRunning = false;
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
+
}
}
});
@@ -696,16 +565,16 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
+ parent.systemRunning = false;
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -721,12 +590,21 @@
if (res.code === 200){
var sites = res.data;
for (var i = 0; i < sites.length; i++){
- $("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus);
+ var siteEl = $("#site-"+sites[i].siteId);
+ siteEl.attr("class", "site " + sites[i].siteStatus);
+ if (sites[i].workNo != null && sites[i].workNo>0) {
+ siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
+ } else {
+ siteEl.html(sites[i].siteId);
+ }
+ if (i+1===8) {
+ carAnimate(i+1, Number(sites[i].nearbySta));
+ }
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -742,12 +620,17 @@
if (res.code === 200){
var crns = res.data;
for (var i = 0; i < crns.length; i++){
- crnAnimate(crns[i].crnId, crns[i].offset);
+ var crnEl = $("#crn-"+crns[i].crnId);
+ crnEl.attr("class", "machine " + crns[i].crnStatus);
+
+ var unit = $('.item').eq(0).width()+4;
+ crnEl.animate({left: (crns[i].bay * unit + 50) +'px'}, 1000);
+ // crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -761,11 +644,14 @@
method: 'POST',
success: function (res) {
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);
+ }
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -775,11 +661,11 @@
function crnAnimate(id, leftVal) {
switch (id) {
case 1:
- $("#crn1").animate({left: leftVal+'px'}, 1000);
+ $("#crn-1").animate({left: leftVal+'px'}, 1000);
crn1Position = leftVal;
break;
case 2:
- $("#crn2").animate({left: leftVal+'px'}, 1000);
+ $("#crn-2").animate({left: leftVal+'px'}, 1000);
crn2Position = leftVal;
break;
default:
@@ -791,8 +677,12 @@
// 杈撻�佽澶囩偣鍑讳簨浠�
$('.site').on('click', function () {
+ var id = this.id.split("-")[1];
+ if (id === undefined) {
+ return;
+ }
layer.open({
- title: "1204绔欑偣淇℃伅",
+ title: id + " 绔欑偣淇℃伅璇︽儏",
closeBtn: 0,
skin: 'layui-layer-lan',
offset: '180px',
@@ -801,17 +691,29 @@
content: $('#siteWindow'),
area: ['35rem', '18rem'],
btn: ['纭畾', '鍏抽棴'],
- yes: function(index, layero){
- layer.close(index);
- alert(1);
+ 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: "1鍙峰爢鍨涙満",
+ title: id+"鍙峰爢鍨涙満",
skin: 'layui-layer-lan',
closeBtn: 0,
type: 1,
@@ -820,12 +722,53 @@
content: $("#crnWindow"),
area: ['40rem', '20rem'],
btn: ['纭畾', '鍏抽棴'],
- yes: function(index, layero){
- layer.close(index);
- alert(1);
+ 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) {
+ switch (target) {
+ case 1:
+ targetTop += 160;
+ break;
+ case 2:
+ targetTop += 140;
+ break;
+ case 3:
+ targetTop += 80;
+ break;
+ case 4:
+ targetTop += 40;
+ break;
+ case 7:
+ targetTop += 0;
+ break;
+ default:
+ return;
+ }
+ } else {
+ return;
+ }
+ $("#site-" + id).animate({top: targetTop+'px'}, 1000);
+ }
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1