From a3c99f39f98f5fd1ced3f8b84d0789160c8d72ed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 九月 2020 10:04:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 758 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 416 insertions(+), 342 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 32d51a6..4c9672a 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -11,13 +11,13 @@
<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;
- }
+ /*.layui-layer-lan .layui-layer-btn {*/
+ /*border-top: none;*/
+ /*}*/
.layui-layer-lan .layui-layer-btn a {
background: #4476A7;
border-color: #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">
@@ -85,198 +85,31 @@
</div>
- <!-- 宸﹁緭閫佺嚎 -->
- <!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
+ <!----------- 宸﹁緭閫佺嚎 ---------->
+
+ <!-- 鍙拌溅杞ㄩ亾 -->
+ <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-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>
- <!-- 绗簩鍒楋紙瀹藉害 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>
- <!-- 绗笁鍒楋紙瀹藉害 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-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>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<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">
+ <span class="row-no">1#</span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site site-none"> </div>
+ <div id="site-6" class="site" style="">6</div>
<button class="item">1</button>
<button class="item">2</button>
<button class="item">3</button>
@@ -305,48 +138,22 @@
<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>
+ <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="crn2" class="machine"></div>
+ <div id="crn-1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-11" class="site">11</div>
+ <div id="site-5" class="site" style="">5</div>
<button class="item">1</button>
<button class="item">2</button>
<button class="item">3</button>
@@ -375,41 +182,15 @@
<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="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>
+ <span class="row-no">2#</span>
</div>
</div>
</main>
@@ -418,95 +199,298 @@
<!-- 杈撻�佽澶囧脊绐� -->
<div id="siteWindow" style="display: none">
<form>
- <label>璁惧鍙�<input type="text" name="devpNo" value="12" disabled="disabled"></label>
- <label>宸ヤ綔鍙�<input type="text" name="workNo" value="9998" disabled="disabled"></label>
- <label>宸ヤ綔鐘舵��<input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled"></label>
- <label>鑷姩<input type="checkbox" name="auto" disabled="disabled" checked></label>
- <label>鏈夌墿<input type="checkbox" name="loading" disabled="disabled" checked></label>
- <label>鑳藉叆<input type="checkbox" name="canining" disabled="disabled" checked></label>
- <label>鑳藉嚭<input type="checkbox" name="canouting" disabled="disabled" checked></label>
- <label>鍑哄叆绫诲瀷<input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled"></label>
- <label>婧愮珯<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
- <label>鐩爣绔�<input type="text" name="staNo" value="2410" disabled="disabled"></label>
- <label>婧愬簱浣�<input type="text" name="sourceStock" value="" disabled="disabled"></label>
- <label>鐩爣搴撲綅<input type="text" name="stock" value="" disabled="disabled"></label>
+ <!-- 绗竴琛� -->
+ <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">
- <label>鍫嗗灈鏈哄彿<input type="text" name="crnNo" value="12" disabled="disabled"></label>
- <label>宸ヤ綔鍙�<input type="text" name="workNo" value="9998" disabled="disabled"></label>
- <label>婧愮珯<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
- <label>鐩爣绔�<input type="text" name="staNo" value="2410" disabled="disabled"></label>
- <label>宸ヤ綔鐘舵��<input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled"></label>
- <label>鍑哄叆绫诲瀷<input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled"></label>
- <label>婧愬簱浣�<input type="text" name="sourceStock" value="" disabled="disabled"></label>
- <label>鐩爣搴撲綅<input type="text" name="stock" value="" disabled="disabled"></label>
- <label>鍫嗗灈鏈虹姸鎬�<input type="text" name="crnStatus" disabled="disabled"></label>
- <label>寮傚父<input type="text" name="error" disabled="disabled" checked></label>
+ <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>
<script>
- var systemRunning = true;
var crn1Position = 0;
var crn2Position = 0;
// 鍒濆鍖�
getSitesInfo();
getCrnInfo();
+ getSystemRunningStatus();
+ getBarcodeInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
- }, 500);
+ getSystemRunningStatus();
+ getBarcodeInfo()
+ }, 1000);
setInterval(function () {
getSitesInfo();
}, 3000);
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (systemRunning){
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1}, function(pass, idx){
+ if (parent.systemRunning){
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
- if ("123"!==pass){
- alert("鍙ｄ护閿欒");
- return;
- }
- var index = null;
- index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- setTimeout(function () {
- if (systemRunning){
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
- } else {
+ doSwitch(0, pass); // 鍋滄wcs绯荤粺
+ });
+ } else {
+ doSwitch(1); // 鍚姩wcs绯荤粺
+ }
+ }
+
+ // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
+ function doSwitch(operatorType, password) {
+ // 鍔犺浇tips
+ var index = layer.load(1, {
+ shade: [0.1,'#fff']
+ });
+ $.ajax({
+ url: baseUrl+ "/console/system/switch",
+ headers: {'token': localStorage.getItem('token')},
+ // async: false,
+ data: {
+ operatorType: operatorType,
+ password: password
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(index);
+ if (res.code === 200){
+ 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("绯荤粺宸插仠姝�!");
+ parent.systemRunning = false;
}
- layer.close(index);
- }, 2000);
- });
-
- } else {
- var index = null;
- index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- setTimeout(function () {
- if (systemRunning){
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
- } else {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ } else if (res.code === 403){
+ parent.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+
}
- layer.close(index);
- }, 2000);
- }
+ }
+ });
+
+ }
+
+ // 鑾峰彇wcs绯荤粺杩愯鐘舵��
+ function getSystemRunningStatus() {
+ $.ajax({
+ url: baseUrl+ "/console/system/running/status",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ if (res.data.status) {
+ $('#system-icon').attr("class", "system-icon-open");
+ $('#system-run-desc').html("绯荤粺杩愯涓�...");
+ parent.systemRunning = true;
+ } else {
+ $('#system-icon').attr("class", "system-icon-close");
+ $('#system-run-desc').html("绯荤粺宸插仠姝�!");
+ parent.systemRunning = false;
+ }
+ } else if (res.code === 403){
+ parent.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
}
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
@@ -519,12 +503,18 @@
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);
+ }
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -540,12 +530,15 @@
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);
+ // crnAnimate(crns[i].crnId, crns[i].offset);
+ 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);
}
}
});
@@ -559,11 +552,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);
}
}
});
@@ -573,11 +569,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:
@@ -589,33 +585,111 @@
// 杈撻�佽澶囩偣鍑讳簨浠�
$('.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',
type: 1,
shadeClose: true,
content: $('#siteWindow'),
- area: ['30rem', '18rem'],
- btn: ['纭畾', '鍏抽棴']
+ 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: "1鍙峰爢鍨涙満",
+ title: id+"鍙峰爢鍨涙満",
skin: 'layui-layer-lan',
closeBtn: 0,
type: 1,
- offset: '180px',
+ offset: '150px',
shadeClose: true,
content: $("#crnWindow"),
- area: ['30rem', '18rem'],
- btn: ['纭畾', '鍏抽棴']
+ 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) {
+ 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);
+ }
+
+
+ // 鍙拌溅鐐瑰嚮浜嬩欢
+ $(document).on("click", ".item", function () {
+ var value = prompt('鐩爣绔欙細', "1");
+ if (value == null) {
+ alert('涓嶈兘涓虹┖锛�');
+ } else if (value === '') {
+ alert('涓嶈兘涓虹┖锛�');
+ } else {
+ carAnimate(8, Number(value));
+ }
+ })
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1