From f19e1f429e3405202957b9c3dacbec06f0764a05 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 15 三月 2022 14:51:07 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 334 ++++----
src/main/webapp/static/css/ste.css | 283 ++++++++
src/main/webapp/views/console.html | 1055 ++++++++++-------------------
src/main/webapp/views/index.html | 1
src/main/webapp/views/ste.html | 152 ++++
src/main/webapp/static/css/crn.css | 13
src/main/webapp/static/css/pipeline.css | 12
src/main/webapp/static/css/console.css | 3
src/main/webapp/views/pipeline.html | 191 ++--
src/main/webapp/static/css/index.css | 9
src/main/resources/application.yml | 2
11 files changed, 1,106 insertions(+), 949 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e08f960..730354f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.0.99:1433;databasename=bfasrs
+ url: jdbc:sqlserver://192.168.4.229:1433;databasename=bfasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index e11d214..308d715 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -28,7 +28,7 @@
width: 100%;
height: 23% ;
position: absolute;
- bottom: 1%;
+ bottom: 2.5%;
}
/* 鎺у埗寮�鍏� */
.system-state {
@@ -320,6 +320,7 @@
}
/* 搴撲綅缁� */
.stock-group .item {
+ width: 30px;
float: left;
border-top: 1px solid rgb(194,76,65);
border-bottom: 1px solid rgb(194,76,65);
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
index 4ff0c57..6e1a7c7 100644
--- a/src/main/webapp/static/css/crn.css
+++ b/src/main/webapp/static/css/crn.css
@@ -1,11 +1,14 @@
body {
- padding: 10px;
- background-color: #f1f1f1;
+ background-color: #6CA7A8;
}
.button-window {
float: left;
- width: 5%;
+ width: 100%;
height: 100%;
+ padding: 10px;
+ background-color: #6CA7A8;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0 0 0 .3);
}
/* -------------------- 绗竴妯″潡 -------------------- */
.log-board {
@@ -19,7 +22,7 @@
.command-log {
float: left;
height: 100%;
- width: 19%;
+ width: 20%;
text-align: center;
}
.command-log h2 {
@@ -51,7 +54,7 @@
.crn-state {
float: left;
height: 100%;
- width: 76%;
+ width: 80%;
overflow: auto;
}
/* 鍫嗗灈鏈虹姸鎬佽〃 */
diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css
index 15641b0..089ed6d 100644
--- a/src/main/webapp/static/css/index.css
+++ b/src/main/webapp/static/css/index.css
@@ -41,7 +41,7 @@
}
.sidebar ul {
font-size: 20px;
- font-weight: 700;
+ font-weight: 5c00;
padding-left: 15%;
}
@@ -51,16 +51,17 @@
}
.sidebar a:hover {
- color: rgb(87,214,201);
+ color: rgb(255, 148, 111);
}
.nav-unselect {
- color: #5D7677;
+ color: #FFFFFF;
}
.nav-select {
- color: rgb(87,214,201);
+ font-weight: 900;
+ color: rgb(255, 148, 111);
}
diff --git a/src/main/webapp/static/css/pipeline.css b/src/main/webapp/static/css/pipeline.css
index 3ab1456..0a846ef 100644
--- a/src/main/webapp/static/css/pipeline.css
+++ b/src/main/webapp/static/css/pipeline.css
@@ -1,6 +1,6 @@
body {
- padding: 10px;
- background-color: #f1f1f1;
+ /*padding: 10px;*/
+ background-color: #6CA7A8;
}
main {
background-color: #fff;
@@ -11,13 +11,17 @@
}
.button-window {
float: left;
- width: 5%;
+ width: 100%;
height: 100%;
+ padding: 10px;
+ background-color: #6CA7A8;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0 0 0 .3);
}
.main-board {
padding-left: 1%;
float: left;
- width: 47.5%;
+ width: 50%;
height: 100%;
overflow: auto;
}
diff --git a/src/main/webapp/static/css/ste.css b/src/main/webapp/static/css/ste.css
new file mode 100644
index 0000000..a422487
--- /dev/null
+++ b/src/main/webapp/static/css/ste.css
@@ -0,0 +1,283 @@
+body {
+ background-color: #6CA7A8;
+}
+.button-window {
+ float: left;
+ width: 100%;
+ height: 100%;
+ padding: 10px;
+ background-color: #6CA7A8;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0 0 0 .3);
+}
+/* -------------------- 绗竴妯″潡 -------------------- */
+.log-board {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ height: 25%;
+}
+/* 宸� */
+.command-log {
+ float: left;
+ height: 100%;
+ width: 20%;
+ text-align: center;
+}
+.command-log h2 {
+ padding: 10px;
+}
+
+.ste-command-item {
+ padding: 4px 0;
+}
+.ste-command-item label {
+ font-size: 20px;
+ font-weight: bold;
+ vertical-align: middle;
+}
+.demoBtn {
+ vertical-align: middle;
+ width: 30%;
+ height: 30px;
+ left: 0;
+ top: 0;
+ text-shadow: inherit;
+ font-size: 15px;
+ margin-left: 5px;
+ margin-right: 5px;
+ display: inline-block;
+ background-color: #FF5722;
+ border: none;
+ color: #FFF;
+ box-shadow: 1px 1px 5px #B6B6B6;
+ border-radius: 3px;
+ cursor: pointer;
+}
+.demoBtn:hover {
+ opacity: 0.8
+}
+.demoBtn:focus {
+ outline: 0;
+}
+.ste-command-item span {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ background-color: #2e9926;
+ border-radius: 5px;
+ vertical-align: middle;
+}
+
+/* 鍙� */
+.ste-state {
+ float: left;
+ height: 100%;
+ width: 80%;
+ overflow: auto;
+}
+/* 绌挎杞︾姸鎬佽〃 */
+#ste-state-table {
+ font-size: 12px;
+ border-collapse: collapse;
+ margin: 0 auto;
+ text-align: center;
+}
+#ste-state-table td, #ste-state-table th {
+ border: 1px solid #cad9ea;
+ color: #666;
+ height: 25px;
+}
+#ste-state-table thead th {
+ background-color: #CCE8EB;
+ width: 300px;
+}
+#ste-state-table tr:nth-child(odd) {
+ background: #fff;
+}
+#ste-state-table tr:nth-child(even) {
+ background: #F5FAFA;
+}
+
+/* -------------------- 绗簩妯″潡 -------------------- */
+.ste-msg {
+ /*overflow: auto;*/
+ margin-top: 10px;
+ height: 23%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+}
+/* 鍫嗗灈鏈虹姸鎬佷俊鎭〃 */
+#ste-msg-table {
+ font-size: 12px;
+ border-collapse: collapse;
+ margin: 0 auto;
+ text-align: center;
+}
+#ste-msg-table td, #ste-msg-table th {
+ border: 1px solid #f1f1f1;
+ color: #666;
+ height: 30px;
+}
+#ste-msg-table thead th {
+ background-color: #fff;
+ width: 400px;
+}
+#ste-msg-table tr:nth-child(odd) {
+ background: #fff;
+}
+#ste-msg-table tr:nth-child(even) {
+ background: #fff;
+}
+
+/* -------------------- 绗笁妯″潡 -------------------- */
+
+.ste-operation {
+ position: relative;
+ margin-top: 10px;
+ height: 25%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+/* 浠诲姟璁惧閫夋嫨妗� */
+.task-select {
+ width: 13%;
+ height: 100%;
+ overflow: hidden;
+ display: inline-block;
+ padding: 20px 0 10px 20px;
+ /*clear: right;*/
+}
+.operator-item {
+ display: inline-block;
+ height: 100%;
+ text-align: center;
+ position: relative;
+ vertical-align: middle;
+ padding: 0 20px;
+}
+.operator-item .select-title {
+ display: inline-block;
+ position: absolute;
+ top: -11px;
+ left: 50%;
+ transform: translate(-50%, 0);
+ background-color: #fff;
+ color: #2e95d3;
+ font-size: 12px;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+ padding: 5px;
+ z-index: 999;
+}
+.operator-item .select-container {
+ padding: 30px 0;
+ height: 100%;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+}
+#ste-select .select-container label {
+ display: block;
+ padding: 15px 40px;
+ vertical-align: middle; margin-top:-2px; margin-bottom:1px;
+
+}
+.select-container input {
+ display: inline-block;
+ font-size: 12px;
+ vertical-align: middle; margin-top:-2px; margin-bottom:1px;
+}
+.select-container-item {
+ display: inline-block;
+ padding: 0 10px;
+}
+.select-container-item input {
+ height: 20px;
+ border: 1px solid #8D8D8D;
+ border-radius: 3px;
+ width: 80px;
+ outline: none;
+}
+
+/* 浠诲姟浣滀笟閫夋嫨妗� */
+.task-operator {
+ width: 86%;
+ height: 100%;
+ overflow: hidden;
+ padding: 5px 0 10px 20px;
+ display: inline-block;
+ margin-right: 10px;
+}
+.task-operator fieldset {
+ padding: 15px 20px 5px 50px;
+ /*border-width: 1px;*/
+ /*border-style: solid;*/
+ height: 100%;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+}
+.task-operator legend {
+ background-color: #fff;
+ color: #2e95d3;
+ font-size: 12px;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+ padding: 5px;
+ z-index: 999;
+}
+button.item {
+ margin-top: 5px;
+ border: 1px solid #333;
+ font-size: 13px;
+ padding: 1px 1px 1px 1px;
+ width: 100px;
+ height: 40px;
+ outline: none;
+ cursor: pointer;
+ color: #333;
+ background-color: transparent;
+ margin-right: 5px;
+ border-radius: 5px;
+}
+button.item:hover {
+ background-color: #333;
+ color: #fff;
+}
+
+/* 鎵嬪姩鎿嶄綔閬僵 */
+.ste-operation-shade {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ z-index: 1000;
+ text-align: center;
+ padding: 80px 0;
+}
+.ste-operation-shade-span {
+ font-size: xx-large;
+ font-weight: bold;
+ color: red;
+}
+
+/* -------------------- 绗洓妯″潡 -------------------- */
+.ste-output-board {
+ margin-top: 10px;
+ height: 20%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+}
+#ste-output {
+ border-left: none;
+ border-right: none;
+ border-top: 1px solid #9d9d9d;
+ border-bottom: 1px solid #333;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ resize:none;
+ color: #666;
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e28905a..0b6b68f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -91,164 +91,180 @@
<div class="lane">
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
+ <button class="item" style="margin-left: 82px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
+ <button class="item">23</button>
<span class="row-no">1#</span>
</div>
<div class="stock-group">
- <div id="site-100" class="site" style="">100</div>
+ <button class="item" style="margin-left: 82px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
+ <button class="item">23</button>
<span class="row-no">2#</span>
</div>
- <!-- 鍫嗗灈鏈� -->
+ <div class="stock-group">
+ <div id="site-100" class="site" style="">100</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>
+ <span class="row-no">3#</span>
+ </div>
+ <!-- 1鍙峰爢鍨涙満 -->
<div class="crn">
<hr class="pathway">
<div id="crn-1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-101" class="site" style="">101</div>
+ <button class="item" style="margin-left: 112px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">3#</span>
+ <span class="row-no">4#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
+ <button class="item" style="margin-left: 112px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">4#</span>
+ <span class="row-no">5#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">6#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 232px">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" style="margin-left: 60px">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" style="margin-left: 60px">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <span class="row-no">7#</span>
</div>
</div>
<!-- 绗簩缁� -->
@@ -256,82 +272,93 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site" style="background-color: rgb(108,167,168)"></div>
+ <button class="item" style="margin-left: 232px">1</button>
<button class="item">2</button>
+ <button class="item">3</button>
<button class="item">4</button>
- <button class="item">6</button>
+ <button class="item">5</button>
+ <button class="item" style="margin-left: 60px">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" style="margin-left: 60px">11</button>
<button class="item">12</button>
+ <button class="item">13</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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">5#</span>
+ <span class="row-no">8#</span>
</div>
<div class="stock-group">
- <div id="site-102" class="site" style="">102</div>
+ <button class="item" style="margin-left: 142px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">6#</span>
+ <button class="item">21</button>
+ <span class="row-no">9#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">10#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">11#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -340,164 +367,178 @@
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-103" class="site" style="">103</div>
+ <button class="item" style="margin-left: 142px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">7#</span>
+ <button class="item">21</button>
+ <span class="row-no">12#</span>
</div>
<div class="stock-group">
- <div class="site" style="background-color: rgb(108,167,168)"></div>
+ <button class="item" style="margin-left: 142px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">8#</span>
+ <button class="item">21</button>
+ <span class="row-no">13#</span>
</div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">14#</span>
+ </div>
+
</div>
<!--绗笁缁�-->
<div class="lane">
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
+ <button class="item" style="margin-left: 142px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">9#</span>
+ <button class="item">21</button>
+ <span class="row-no">15#</span>
</div>
<div class="stock-group">
- <div id="site-104" class="site" style="">104</div>
+ <button class="item" style="margin-left: 142px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">10#</span>
+ <button class="item">21</button>
+ <span class="row-no">16#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">17#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 142px">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>
+ <span class="row-no">18#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -506,411 +547,82 @@
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-105" class="site" style="">105</div>
+ <button class="item" style="margin-left: 82px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">11#</span>
- </div>
- <div class="stock-group">
- <button class="item" style="margin-left: 82px">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">12#</span>
- </div>
- </div>
- <!--绗洓缁�-->
- <div class="lane">
- <span class="row-no"></span>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <button class="item" style="margin-left: 82px">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">13#</span>
- </div>
- <div class="stock-group">
- <div id="site-106" class="site" style="">106</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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">14#</span>
- </div>
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn-4" 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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">15#</span>
- </div>
- <div class="stock-group">
- <button class="item" style="margin-left: 82px">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">16#</span>
- </div>
- </div>
- <!--绗簲缁�-->
- <div class="lane">
- <span class="row-no"></span>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <button class="item" style="margin-left: 82px">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">17#</span>
- </div>
- <div class="stock-group">
- <div id="site-108" class="site" style="">108</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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
- <span class="row-no">18#</span>
- </div>
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn-5" class="machine"></div>
- </div>
- <!-- 璐ф灦 -->
- <div class="stock-group">
- <div id="site-109" class="site" style="">109</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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
+ <button class="item">23</button>
<span class="row-no">19#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
+ <button class="item" style="margin-left: 82px">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">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>
- <button class="item">50</button>
- <button class="item">52</button>
- <button class="item">54</button>
- <button class="item">56</button>
- <button class="item">58</button>
- <button class="item">60</button>
- <button class="item">62</button>
- <button class="item">64</button>
- <button class="item">66</button>
- <button class="item">68</button>
- <button class="item">70</button>
+ <button class="item">23</button>
<span class="row-no">20#</span>
+ </div>
+ <div class="stock-group">
+ <button class="item" style="margin-left: 82px">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>
+ <span class="row-no">21#</span>
</div>
</div>
</div>
@@ -955,7 +667,7 @@
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
<span>杩愯緭绾挎�绘暟</span>
- <span class="line-ss">45</span>
+ <span class="line-ss">48</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
@@ -1220,9 +932,9 @@
</html>
<script>
var tData = []
- var tDate1 = []
- var tDate2 = []
- var tDate3 = []
+ var tData1 = []
+ var tData2 = []
+ var tData3 = []
function getCodeData(){
$.ajax({
url:baseUrl +'/console/barcode/output/site',
@@ -1230,25 +942,22 @@
success:function (res) {
if(res.code === 200){
tData = eval(res.data);
- console.log(tData)
if(tData.length<=5){
tData1 = tData
} else if (tData.length<=10){
- tDate1 = tData.slice(0,5)
+ tData1 = tData.slice(0,5)
tData.splice(0,5)
- tDate2 = tData
- console.log(tDate2)
+ tData2 = tData
} else if(tData.length<=15){
- tDate1 = tData.slice(0,5)
- tDate2 = tData.slice(6,10)
+ tData1 = tData.slice(0,5)
+ tData2 = tData.slice(6,10)
tData.splice(0,10)
- tDate3 = tData
- console.log(tDate3)
+ tData3 = tData
} else {
tData = tData.slice(-15)
- tDate1 = tData.slice(-15)
- tDate2 = tData.slice(-10)
- tDate3 = tData.slice(-5)
+ tData1 = tData.slice(-15)
+ tData2 = tData.slice(-10)
+ tData3 = tData.slice(-5)
}
}
@@ -1264,17 +973,16 @@
function renderBarCode() {
- for (var i = 0;i<tDate1.length;i++){
- console.log(tDate1[i])
- var str1 = '<li><span>' + tDate1[i].barcode + '</span><span class="right">' + tDate1[i].time + '</span></li>'
+ 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<tDate2.length;j++){
- var str2 = '<li><span>' + tDate2[j].barcode + '</span><span class="right">' + tDate2[j].time + '</span></li>'
+ 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<tDate3.length;k++){
- var str3 = '<li><span>' + tDate3[k].barcode + '</span><span class="right">' + tDate3[k].time + '</span></li>'
+ 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)
}
}
@@ -1300,9 +1008,9 @@
for (var val in res.data) {
var find = $("#siteWindow").find(":input[name='" + val + "']");
if (find[0].type==='text') {
- find.val(data[val]);
+ find.val(res.data[val]);
} else if (find[0].type === 'checkbox') {
- find.attr("checked", data[val] === 'Y');
+ find.attr("checked", res.data[val] === 'Y');
}
}
}
@@ -1399,7 +1107,6 @@
},
method: 'POST',
success: function (res) {
- console.log(res)
layer.close(index);
if (res.code === 200){
if (res.data.status) {
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index f4ed572..4370c60 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -41,187 +41,181 @@
</style>
</head>
<body>
-<div class="button-window"></div>
-<!-- 鏃ュ織鐩戞帶鏉� -->
-<div class="log-board">
- <!-- 鎵ц鍛戒护 -->
-
- <!-- 鎵ц鍛戒护 -->
- <div class="command-log">
- <h3>鎵ц涓殑鍛戒护</h3>
- <div class="crn-command-item">
- <label>1#</label>
- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn1" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>2#</label>
- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn5" disabled="disabled">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="crn-state">
- <table id="crn-state-table">
- <thead>
- <tr>
- <th>鍫嗗灈鏈�</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>璐у弶瀹氫綅</th>
- <th>杞借揣鍙板畾浣�</th>
- <th>璧拌鍦ㄥ畾浣�</th>
- <th>鏁呴殰浠ｇ爜</th>
- <th>鏁呴殰鎻忚堪</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
+<div style="padding: 10px;height: 100%;float: left;width: 6%">
+ <div class="button-window"></div>
</div>
-<!-- 鍫嗗灈鏈虹姸鎬� -->
-<div class="crn-msg">
- <table id="crn-msg-table">
- <thead>
- <tr>
- <th>鍫嗗灈鏈�</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
- <th>璧拌閫熷害锛坢/min)</th>
- <th>鍗囬檷閫熷害锛坢/min)</th>
- <th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(m)</th>
- <th>鍗囬檷璺濈(m)</th>
- <th>璧拌鏃堕暱(s)</th>
- <th>鍗囬檷鏃堕暱(s)</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
-</div>
-<!-- 鎵嬪姩鎿嶄綔 -->
-<div class="crn-operation">
+<div style="height: 100%;padding-left: 6%">
+ <div style="padding: 10px;height: 100%">
+ <!-- 鏃ュ織鐩戞帶鏉� -->
+ <div class="log-board">
+ <!-- 鎵ц鍛戒护 -->
- <!-- 閬僵灞� -->
- <div class="crn-operation-shade">
- <span class="crn-operation-shade-span">
- WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
- </span>
- </div>
-
- <!-- 璁惧浠诲姟閫夋嫨 -->
- <div class="task-select">
- <!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item">
- <span class="select-title">鍫嗗灈鏈哄彿</span>
- <div class="select-container">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
+ <!-- 鎵ц鍛戒护 -->
+ <div class="command-log">
+ <h3>鎵ц涓殑鍛戒护</h3>
+ <div class="crn-command-item">
+ <label>1#</label>
+ <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn1" disabled="disabled">
+ </div>
+ <div class="crn-command-item" style="margin-top: 25px">
+ <label>2#</label>
+ <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn2" disabled="disabled">
+ </div>
+ <div class="crn-command-item" style="margin-top: 25px">
+ <label>3#</label>
+ <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn3" disabled="disabled">
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
+ <div class="crn-state">
+ <table id="crn-state-table">
+ <thead>
+ <tr>
+ <th>鍫嗗灈鏈�</th>
+ <th>妯″紡</th>
+ <th>鐘舵��</th>
+ <th>鏈夌墿</th>
+ <th>鍒�</th>
+ <th>灞�</th>
+ <th>璐у弶瀹氫綅</th>
+ <th>杞借揣鍙板畾浣�</th>
+ <th>璧拌鍦ㄥ畾浣�</th>
+ <th>鏁呴殰浠ｇ爜</th>
+ <th>鏁呴殰鎻忚堪</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
</div>
</div>
- <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
- <div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
- <div class="select-container">
- <div class="select-container-item">
- <span>绔�</span>
- <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
+ <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <div class="crn-msg">
+ <table id="crn-msg-table">
+ <thead>
+ <tr>
+ <th>鍫嗗灈鏈�</th>
+ <th>宸ヤ綔鍙�</th>
+ <th>鐘舵��</th>
+ <th>婧愮珯</th>
+ <th>鐩爣绔�</th>
+ <th>婧愬簱浣�</th>
+ <th>鐩爣搴撲綅</th>
+ <th>璧拌閫熷害锛坢/min)</th>
+ <th>鍗囬檷閫熷害锛坢/min)</th>
+ <th>鍙夌墮閫熷害锛坢/min)</th>
+ <th>璧拌璺濈(m)</th>
+ <th>鍗囬檷璺濈(m)</th>
+ <th>璧拌鏃堕暱(s)</th>
+ <th>鍗囬檷鏃堕暱(s)</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
</div>
- <!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
- <div id="target-select" class="operator-item">
- <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
- <div class="select-container">
- <div class="select-container-item">
- <span>绔�</span>
- <label><input id="staNo" type="number" name="points" min="0" /></label>
+ <!-- 鎵嬪姩鎿嶄綔 -->
+ <div class="crn-operation">
+
+ <!-- 閬僵灞� -->
+ <div class="crn-operation-shade">
+ <span class="crn-operation-shade-span">
+ WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
+ </span>
+ </div>
+
+ <!-- 璁惧浠诲姟閫夋嫨 -->
+ <div class="task-select">
+ <!-- 鍫嗗灈鏈洪�夋嫨 -->
+ <div id="crn-select" class="operator-item">
+ <span class="select-title">鍫嗗灈鏈哄彿</span>
+ <div class="select-container">
+ <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
+ </div>
</div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
+ <div id="source-select" class="operator-item">
+ <span class="select-title">婧愮珯/婧愬簱浣�</span>
+ <div class="select-container">
+ <div class="select-container-item">
+ <span>绔�</span>
+ <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鎺�</span>
+ <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鍒�</span>
+ <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>灞�</span>
+ <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ </div>
+ </div>
</div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ <!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
+ <div id="target-select" class="operator-item">
+ <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
+ <div class="select-container">
+ <div class="select-container-item">
+ <span>绔�</span>
+ <label><input id="staNo" type="number" name="points" min="0" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鎺�</span>
+ <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鍒�</span>
+ <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>灞�</span>
+ <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ </div>
+ </div>
</div>
</div>
+
+ <!-- 璁惧浠诲姟鎿嶄綔 -->
+ <div class="task-operator">
+ <fieldset>
+ <legend>鎵嬪姩鎿嶄綔</legend>
+ <div class="button-group">
+ <button class="item" onclick="put()">鍏ュ簱</button>
+ <button class="item" onclick="take()">鍑哄簱</button>
+ <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
+ <button class="item" onclick="siteMove()">绔欏埌绔�</button>
+ <!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
+ <!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
+ <!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
+ <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+ <!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
+ <!-- <button class="item" onclick="boot()">鍚姩</button>-->
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="handleReset()">澶嶄綅</button>
+ </div>
+ </fieldset>
+ </div>
+
+ </div>
+ <!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
+ <div class="crn-output-board">
+ <textarea id="crn-output"></textarea>
</div>
</div>
-
- <!-- 璁惧浠诲姟鎿嶄綔 -->
- <div class="task-operator">
- <fieldset>
- <legend>鎵嬪姩鎿嶄綔</legend>
- <div class="button-group">
- <button class="item" onclick="put()">鍏ュ簱</button>
- <button class="item" onclick="take()">鍑哄簱</button>
- <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
- <button class="item" onclick="siteMove()">绔欏埌绔�</button>
- <!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
- <!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
- <!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
- <!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
- <!-- <button class="item" onclick="boot()">鍚姩</button>-->
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
- </div>
- </fieldset>
- </div>
-
-</div>
-<!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
-<div class="crn-output-board">
- <textarea id="crn-output"></textarea>
</div>
</body>
<script>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index c37f3b0..03c9d6c 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -16,6 +16,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
+ <li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">绌挎杞�</a></li>
</ul>
</div>
<!-- 涓讳綋鍐呭 -->
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 1835d67..487bad6 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -17,98 +17,109 @@
</style>
</head>
<body>
-<main>
+<div style="padding: 10px;height: 100%;float: left;width: 6%">
<div class="button-window"></div>
- <!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
- <div id="plc-error" class="main-board" style="padding-left: 10px">
- <!-- 澶撮儴 -->
- <div class="plc-log-header">
- <!-- <div style="height: 40%">-->
- <!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div style="height: 40%">-->
- <!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <div>
- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
- </div>
- </div>
- <!-- 涓讳綋 -->
- <div class="plc-log-body">
- <table id="plc-error-table">
- <thead>
- <tr>
- <th style="width: 200px">搴忓彿</th>
- <th style="width: 400px">PLC閿欒鎻忚堪</th>
- <th style="width: 400px">寮傚父</th>
- </tr>
- </thead>
- <tbody>
-
- </tbody>
- </table>
- </div>
- </div>
-
- <!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
- <div id="site-monitor" class="main-board">
- <!-- 琛ㄦ牸 -->
- <table id="site-table">
- <!-- 琛ㄥご -->
- <thead>
- <tr>
- <th>绔欏彿</th>
- <th>宸ヤ綔鍙�</th>
- <th>鑷姩</th>
- <th>鏈夌墿</th>
- <th>鍙叆</th>
- <th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
- <th>鐩爣绔�</th>
- </tr>
- </thead>
- <!-- 琛ㄦ牸鍐呭 -->
- <tbody></tbody>
- </table>
- </div>
-</main>
-<footer>
- <textarea id="output"></textarea>
-</footer>
-
-<div id="site-detl" style="display: none">
- <form>
- <div class="form-item">
- <label class="form-label">绔欏彿:</label>
- <div class="form-input">
- <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">宸ヤ綔鍙�:</label>
- <div class="form-input">
- <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鐩爣绔�:</label>
- <div class="form-input">
- <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍏ュ簱鏍囪:</label>
- <div class="form-input">
- <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
- </div>
- </div>
- <div class="form-item form-button-container">
- <button class="form-button" id="save">淇濆瓨</button>
- <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
- </div>
- </form>
</div>
+
+<div style="height: 100%;padding-left: 6%">
+ <div style="padding: 10px;height: 100%">
+ <main>
+
+ <!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
+ <div id="plc-error" class="main-board" style="padding-left: 10px">
+ <!-- 澶撮儴 -->
+ <div class="plc-log-header">
+ <!-- <div style="height: 40%">-->
+ <!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
+ <!-- </div>-->
+ <!-- <div style="height: 40%">-->
+ <!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
+ <!-- </div>-->
+ <div>
+ <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
+ </div>
+ </div>
+ <!-- 涓讳綋 -->
+ <div class="plc-log-body">
+ <table id="plc-error-table">
+ <thead>
+ <tr>
+ <th style="width: 200px">搴忓彿</th>
+ <th style="width: 400px">PLC閿欒鎻忚堪</th>
+ <th style="width: 400px">寮傚父</th>
+ </tr>
+ </thead>
+ <tbody>
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
+ <div id="site-monitor" class="main-board">
+ <!-- 琛ㄦ牸 -->
+ <table id="site-table">
+ <!-- 琛ㄥご -->
+ <thead>
+ <tr>
+ <th>绔欏彿</th>
+ <th>宸ヤ綔鍙�</th>
+ <th>鑷姩</th>
+ <th>鏈夌墿</th>
+ <th>鍙叆</th>
+ <th>鍙嚭</th>
+ <th>鍏ュ簱鏍囪</th>
+ <th>绌烘澘淇″彿</th>
+ <th>鐩爣绔�</th>
+ </tr>
+ </thead>
+ <!-- 琛ㄦ牸鍐呭 -->
+ <tbody></tbody>
+ </table>
+ </div>
+ </main>
+ <footer>
+ <textarea id="output"></textarea>
+ </footer>
+
+ <div id="site-detl" style="display: none">
+ <form>
+ <div class="form-item">
+ <label class="form-label">绔欏彿:</label>
+ <div class="form-input">
+ <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">宸ヤ綔鍙�:</label>
+ <div class="form-input">
+ <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鐩爣绔�:</label>
+ <div class="form-input">
+ <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鍏ュ簱鏍囪:</label>
+ <div class="form-input">
+ <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item form-button-container">
+ <button class="form-button" id="save">淇濆瓨</button>
+ <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
+ </div>
+ </form>
+ </div>
+ </div>
+
+</div>
+
+
</body>
<script>
// 鍒濆鍖�
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
new file mode 100644
index 0000000..8652f35
--- /dev/null
+++ b/src/main/webapp/views/ste.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>绌挎杞︾洃鎺х鐞�</title>
+ <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" href="../static/css/ste.css">
+ <script type="text/javascript" src="../static/js/layer/layer.js"></script>
+</head>
+<body>
+ <div style="padding: 10px;height: 100%;float: left;width: 6%">
+ <div class="button-window"></div>
+ </div>
+ <div style="height: 100%;padding-left: 6%">
+ <div style="padding: 10px;height: 100%">
+ <!-- 鏃ュ織鐩戞帶鏉� -->
+ <div class="log-board">
+ <div class="command-log">
+ <h3>鎵ц涓殑鍛戒护</h3>
+ <div class="ste-command-item">
+ <label>1#</label>
+ <button id="demoBtn-1" class="demoBtn" onclick="changePosition()">淇敼浣嶇疆</button>
+ <!-- <span> </span>-->
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ </div>
+ <div class="ste-command-item" style="margin-top: 25px">
+ <label>2#</label>
+ <button id="demoBtn-2" class="demoBtn" onclick="">淇敼浣嶇疆</button>
+ <!-- <span> </span>-->
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ </div>
+ <div class="ste-command-item" style="margin-top: 25px">
+ <label>3#</label>
+ <button id="demoBtn-3" class="demoBtn" onclick="">淇敼浣嶇疆</button>
+ <!-- <span> </span>-->
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
+ <div class="ste-state">
+ <table id="ste-state-table">
+ <thead>
+ <tr>
+ <th>绌挎杞�</th>
+ <th>妯″紡</th>
+ <th>鐘舵��</th>
+ <th>鏈夌墿</th>
+ <th>鍦ㄨ建</th>
+ <th>鐢甸噺</th>
+ <th>鎺�</th>
+ <th>鍒�</th>
+ <th>灞�</th>
+ <th>璐у弶瀹氫綅</th>
+ <th>杞借揣鍙板畾浣�</th>
+ <th>璧拌鍦ㄥ畾浣�</th>
+ <th>鎶ヨ淇℃伅1</th>
+ <th>鎶ヨ淇℃伅2</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <div class="ste-msg">
+ <table id="ste-msg-table">
+ <thead>
+ <tr>
+ <th>绌挎杞�</th>
+ <th>浠诲姟鍙�</th>
+ <th>浠诲姟绫诲瀷</th>
+ <th>褰撳墠浣嶇疆</th>
+ <th>杩戠偣璺濈</th>
+ <th>褰撳墠閫熷害</th>
+ <th>楂樹綆浣�</th>
+ <th>杩囪处鎸囦护浠诲姟鍙�</th>
+ <th>杩囪处鎸囦护鐘舵��</th>
+ <th>鐩樼偣鏁伴噺</th>
+ <th>绌挎鏉垮氨缁�</th>
+ <th>鍏呯數妗╁彿</th>
+ <th>鍫嗗灈鏈鸿繍琛�</th>
+ <th>鍫嗗灈鏈轰几鍙�</th>
+ <th>鍫嗗灈鏈烘惉绉�</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ <!-- 鎵嬪姩鎿嶄綔 -->
+ <div class="ste-operation">
+ <!-- 閬僵灞� -->
+<!-- <div class="ste-operation-shade">-->
+<!-- <span class="ste-operation-shade-span">-->
+<!-- WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔-->
+<!-- </span>-->
+<!-- </div>-->
+ <!-- 璁惧浠诲姟閫夋嫨 -->
+ <div class="task-select">
+ <!-- 閫夋嫨 -->
+ <div id="ste-select" class="operator-item">
+ <span class="select-title">绌挎杞﹀彿</span>
+ <div class="select-container">
+ <label><input type="radio" name="steSelect" value="1" checked> 1鍙风┛姊溅</label>
+ <label><input type="radio" name="steSelect" value="2"> 2鍙风┛姊溅</label>
+ <label><input type="radio" name="steSelect" value="3"> 3鍙风┛姊溅</label>
+ </div>
+ </div>
+ </div>
+ <!-- 璁惧浠诲姟鎿嶄綔 -->
+ <div class="task-operator">
+ <fieldset>
+ <legend>鎵嬪姩鎿嶄綔</legend>
+ <div class="button-group">
+ <button class="item" onclick="put()">宸﹀嚭搴�</button>
+ <button class="item" onclick="take()">鍙冲嚭搴�</button>
+ <button class="item" onclick="stockMove()">宸﹀叆搴�</button>
+ <button class="item" onclick="siteMove()">鍙冲叆搴�</button>
+ <button class="item" onclick="bacOrigin()">宸︾Щ搴�</button>
+ <button class="item" onclick="reverseOrigin()">鍙崇Щ搴�</button>
+ <button class="item" onclick="coorMove()">鍘熺偣</button>
+ <button class="item" onclick="taskComplete()">杩滅偣 </button>
+ <button class="item" onclick="pause()">A 鐐�</button>
+ <button class="item" onclick="boot()">B 鐐�</button>
+ <button class="item" onclick="pause()">宸︽惉绉�</button>
+ <button class="item" onclick="boot()">鍙虫惉绉�</button>
+ <button class="item" onclick="boot()">鍏呯數</button>
+ <button class="item" onclick="pause()">宸︾洏鐐�</button>
+ <button class="item" onclick="boot()">鍙崇洏鐐�</button>
+ <button class="item" onclick="boot()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="handleReset()">澶嶄綅</button>
+ </div>
+ </fieldset>
+ </div>
+
+ </div>
+ <!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
+ <div class="ste-output-board">
+ <textarea id="ste-output"></textarea>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ function changePosition() {
+
+ }
+</script>
\ No newline at end of file
--
Gitblit v1.9.1