From dd37f7a757d46b6b2c43c60d292918ee8cb8634d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 15 三月 2022 15:37:14 +0800
Subject: [PATCH] Merge branch 'bfwcs' of http://47.97.1.152:5880/r/zy-wcs into bfwcs
---
src/main/webapp/views/console.html | 1055 +++++++-------------
src/main/webapp/views/ste.html | 228 ++++
src/main/webapp/static/css/pipeline.css | 12
src/main/webapp/views/pipeline.html | 191 +-
src/main/webapp/views/crn.html | 334 +++---
src/main/webapp/static/css/ste.css | 298 +++++
src/main/webapp/views/index.html | 1
src/main/webapp/static/css/crn.css | 13
src/main/webapp/static/layui/lay/modules/dropdown/dropdown.js | 250 ++++
src/main/webapp/static/css/console.css | 3
src/main/webapp/static/layui/lay/modules/dropdown/dropdown.css | 618 ++++++++++++
src/main/webapp/static/css/index.css | 9
src/main/resources/application.yml | 2
13 files changed, 2,065 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..c21a5d5
--- /dev/null
+++ b/src/main/webapp/static/css/ste.css
@@ -0,0 +1,298 @@
+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: 100%;
+ 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;
+}
+/*鈻间笅鎷夎彍鍗曗柤*/
+.form-item {
+ width: 220px;
+ display: inline-block;
+ color: white;
+ font-size: 16px;
+ font-weight: bold;
+ padding: 3px;margin:3px
+}
+.form-item input {
+ display: inline-block;
+ width: 100px;
+ float: right;
+}
+/*鈻蹭笅鎷夎彍鍗曗柌*/
+/*.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/static/layui/lay/modules/dropdown/dropdown.css b/src/main/webapp/static/layui/lay/modules/dropdown/dropdown.css
new file mode 100644
index 0000000..67b169c
--- /dev/null
+++ b/src/main/webapp/static/layui/lay/modules/dropdown/dropdown.css
@@ -0,0 +1,618 @@
+/** 涓嬫媺鑿滃崟妯″潡 date:2020-05-04 License By http://easyweb.vip */
+
+.dropdown-no-scroll {
+ overflow: hidden;
+}
+
+.dropdown-fix-parent {
+ z-index: auto !important;
+}
+
+/** 閬僵灞� */
+.dropdown-menu-shade {
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 9998;
+ background-color: rgba(0, 0, 0, .1);
+}
+
+.dropdown-menu-shade.no-shade {
+ background-color: transparent;
+}
+
+/** 澶滈棿涓婚 */
+
+.dropdown-menu-nav.dark, .dropdown-menu-nav.dark .dropdown-menu-nav-child {
+ background: #32363F;
+ border-color: #484e58;
+}
+
+.dropdown-menu-nav.dark > li > a, .dropdown-menu-nav.dark .dropdown-menu-nav-child > li > a {
+ color: #a1a8b8;
+}
+
+.dropdown-menu-nav.dark > li > a:hover, .dropdown-menu-nav.dark .dropdown-menu-nav-child > li > a:hover {
+ background-color: #272b34;
+}
+
+.dropdown-menu-nav.dark > li.disabled > a, .dropdown-menu-nav > li.disabled > a:hover,
+.dropdown-menu-nav.dark .dropdown-menu-nav-child > li.disabled > a, .dropdown-menu-nav .dropdown-menu-nav-child > li.disabled > a:hover {
+ color: #7a8191;
+}
+
+.dropdown-menu-nav.dark > hr, .dropdown-menu-nav.dark .dropdown-menu-nav-child > hr {
+ background-color: #484e58;
+}
+
+.dropdown-menu-nav.dark > li.title, .dropdown-menu-nav.dark .dropdown-menu-nav-child > li.title {
+ color: #868b9a;
+}
+
+.dropdown-menu-nav.dark .dropdown-anchor {
+ border-color: #484e58;
+}
+
+.dropdown-menu-nav.dark .dropdown-anchor::after {
+ border-color: #32363F;
+}
+
+/** 鐧借壊涓婚 */
+.dropdown-menu {
+ position: relative;
+ display: inline-block;
+ vertical-align: bottom;
+}
+
+.dropdown-menu-nav, .dropdown-menu-nav .dropdown-menu-nav-child {
+ position: absolute;
+ padding: 5px 0;
+ margin: 0;
+ overflow: visible;
+ min-width: 110px;
+ background: #fff;
+ border-radius: 2px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, .12);
+ border: 1px solid #e4e4e4;
+ line-height: initial;
+ text-align: left;
+ z-index: 9999;
+}
+
+.dropdown-menu .dropdown-menu-nav {
+ display: none;
+}
+
+.dropdown-menu.dropdown-open .dropdown-menu-nav {
+ display: block;
+}
+
+.dropdown-menu-nav.fixed {
+ position: fixed;
+}
+
+.dropdown-menu-nav > li, .dropdown-menu-nav-child > li {
+ padding: 0;
+ margin: 0;
+ line-height: 18px;
+ user-select: none;
+ list-style: none;
+ position: relative;
+}
+
+.dropdown-menu-nav > li > a, .dropdown-menu-nav-child > li > a {
+ display: block;
+ color: #555;
+ font-size: 14px;
+ padding: 10px 15px;
+ text-decoration: none;
+ white-space: nowrap;
+ cursor: pointer;
+ user-select: none;
+}
+
+.dropdown-menu-nav > li > a:hover, .dropdown-menu-nav-child > li > a:hover {
+ background-color: #eeeeee;
+}
+
+.dropdown-menu-nav > li .layui-icon, .dropdown-menu-nav-child > li .layui-icon {
+ font-size: 14px;
+ margin-right: 5px;
+}
+
+.dropdown-menu-nav > hr, .dropdown-menu-nav-child > hr {
+ height: 1px;
+ margin: 3px 0;
+ background-color: #e6e6e6;
+}
+
+/** 绂佺敤鏍峰紡 */
+.dropdown-menu-nav > li.disabled, .dropdown-menu-nav-child > li.disabled {
+ cursor: not-allowed;
+}
+
+.dropdown-menu-nav > li.disabled > a, .dropdown-menu-nav > li.disabled > a:hover,
+.dropdown-menu-nav-child > li.disabled > a, .dropdown-menu-nav-child > li.disabled > a:hover {
+ color: #999;
+ cursor: not-allowed;
+ pointer-events: none;
+ background-color: transparent;
+}
+
+/** 鏍囬鏍峰紡 */
+.dropdown-menu-nav > li.title, .dropdown-menu-nav-child > li.title {
+ color: #999;
+ font-size: 12px;
+ padding: 3px 15px;
+}
+
+/* nav瀛愯彍鍗� */
+.dropdown-menu-nav .dropdown-menu-nav-child {
+ left: 100%;
+ top: 0;
+ display: none;
+}
+
+.dropdown-menu-nav .show-left .dropdown-menu-nav-child {
+ left: auto;
+ right: 100%;
+}
+
+.dropdown-menu-nav > li.active > .dropdown-menu-nav-child, .dropdown-menu-nav-child > li.active > .dropdown-menu-nav-child {
+ display: block;
+}
+
+.dropdown-menu-nav > li.have-more:after, .dropdown-menu-nav-child > li.have-more:after {
+ content: "\e602";
+ font-family: layui-icon !important;
+ font-size: 14px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ position: absolute;
+ right: 4px;
+ color: #666;
+ top: 50%;
+ margin-top: -8px;
+}
+
+/** 灏忕澶� */
+.dropdown-menu-nav .dropdown-anchor, .dropdown-menu-nav .dropdown-anchor:after {
+ border: 8px solid #e4e4e4;
+ position: absolute;
+ display: inline-block;
+}
+
+.dropdown-menu-nav .dropdown-anchor:after {
+ content: '';
+ border: 7px solid #fff;
+}
+
+/** 涓嬪乏浣嶇疆 */
+.dropdown-menu-nav.dropdown-bottom-left {
+ top: 100%;
+}
+
+.dropdown-menu-nav.dropdown-bottom-left {
+ margin-top: 8px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-left .dropdown-anchor, .dropdown-menu-nav.dropdown-bottom-left .dropdown-anchor:after {
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ top: -16px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-left .dropdown-anchor:after {
+ top: -6px;
+ left: -7px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-left .dropdown-anchor {
+ left: 12px;
+}
+
+/** 涓嬪彸浣嶇疆 */
+.dropdown-menu-nav.dropdown-bottom-right {
+ right: 0;
+}
+
+.dropdown-menu-nav.dropdown-bottom-right {
+ margin-top: 8px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-right .dropdown-anchor, .dropdown-menu-nav.dropdown-bottom-right .dropdown-anchor:after {
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ top: -16px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-right .dropdown-anchor:after {
+ top: -6px;
+ left: -7px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-right .dropdown-anchor {
+ right: 12px;
+}
+
+/** 涓嬩腑浣嶇疆 */
+.dropdown-menu-nav.dropdown-bottom-center {
+ left: 50%;
+ /*transform: translateX(-50%);*/
+}
+
+.dropdown-menu-nav.dropdown-bottom-center {
+ margin-top: 8px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-center .dropdown-anchor, .dropdown-menu-nav.dropdown-bottom-center .dropdown-anchor:after {
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ top: -16px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-center .dropdown-anchor:after {
+ top: -6px;
+ left: -7px;
+}
+
+.dropdown-menu-nav.dropdown-bottom-center .dropdown-anchor {
+ left: calc(50% - 8px);
+}
+
+/** 涓婂乏浣嶇疆 */
+.dropdown-menu-nav.dropdown-top-left {
+ bottom: 100%;
+}
+
+.dropdown-menu-nav.dropdown-top-left {
+ margin-bottom: 8px;
+}
+
+.dropdown-menu-nav.dropdown-top-left .dropdown-anchor, .dropdown-menu-nav.dropdown-top-left .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ bottom: -16px;
+}
+
+.dropdown-menu-nav.dropdown-top-left .dropdown-anchor:after {
+ top: -8px;
+ left: -7px;
+ bottom: auto;
+}
+
+.dropdown-menu-nav.dropdown-top-left .dropdown-anchor {
+ left: 12px;
+}
+
+/** 涓婂彸浣嶇疆 */
+.dropdown-menu-nav.dropdown-top-right {
+ bottom: 100%;
+ right: 0;
+}
+
+.dropdown-menu-nav.dropdown-top-right {
+ margin-bottom: 8px;
+}
+
+.dropdown-menu-nav.dropdown-top-right .dropdown-anchor, .dropdown-menu-nav.dropdown-top-right .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ bottom: -16px;
+}
+
+.dropdown-menu-nav.dropdown-top-right .dropdown-anchor:after {
+ top: -8px;
+ left: -7px;
+ bottom: auto;
+}
+
+.dropdown-menu-nav.dropdown-top-right .dropdown-anchor {
+ right: 12px;
+}
+
+/** 涓婁腑浣嶇疆 */
+.dropdown-menu-nav.dropdown-top-center {
+ bottom: 100%;
+ left: 50%;
+ /*transform: translateX(-50%);*/
+}
+
+.dropdown-menu-nav.dropdown-top-center {
+ margin-bottom: 8px;
+}
+
+.dropdown-menu-nav.dropdown-top-center .dropdown-anchor, .dropdown-menu-nav.dropdown-top-center .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ bottom: -16px;
+}
+
+.dropdown-menu-nav.dropdown-top-center .dropdown-anchor:after {
+ top: -8px;
+ left: -7px;
+ bottom: auto;
+}
+
+.dropdown-menu-nav.dropdown-top-center .dropdown-anchor {
+ left: calc(50% - 8px);
+}
+
+/** 宸︿笂浣嶇疆 */
+.dropdown-menu-nav.dropdown-left-top {
+ right: 100%;
+ bottom: 0;
+}
+
+.dropdown-menu-nav.dropdown-left-top {
+ margin-right: 8px;
+}
+
+.dropdown-menu-nav.dropdown-left-top .dropdown-anchor, .dropdown-menu-nav.dropdown-left-top .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-top-color: transparent;
+ right: -16px;
+}
+
+.dropdown-menu-nav.dropdown-left-top .dropdown-anchor:after {
+ top: -7px;
+ left: -8px;
+ right: auto;
+}
+
+.dropdown-menu-nav.dropdown-left-top .dropdown-anchor {
+ bottom: 12px;
+}
+
+/** 宸︿笅浣嶇疆 */
+.dropdown-menu-nav.dropdown-left-bottom {
+ right: 100%;
+ top: 0;
+}
+
+.dropdown-menu-nav.dropdown-left-bottom {
+ margin-right: 8px;
+}
+
+.dropdown-menu-nav.dropdown-left-bottom .dropdown-anchor, .dropdown-menu-nav.dropdown-left-bottom .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-top-color: transparent;
+ right: -16px;
+}
+
+.dropdown-menu-nav.dropdown-left-bottom .dropdown-anchor:after {
+ top: -7px;
+ left: -8px;
+ right: auto;
+}
+
+.dropdown-menu-nav.dropdown-left-bottom .dropdown-anchor {
+ top: 12px;
+}
+
+/** 宸︿腑浣嶇疆 */
+.dropdown-menu-nav.dropdown-left-center {
+ right: 100%;
+ top: 50%;
+ /*transform: translateY(-50%);*/
+}
+
+.dropdown-menu-nav.dropdown-left-center {
+ margin-right: 8px;
+}
+
+.dropdown-menu-nav.dropdown-left-center .dropdown-anchor, .dropdown-menu-nav.dropdown-left-center .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-right-color: transparent;
+ border-top-color: transparent;
+ right: -16px;
+}
+
+.dropdown-menu-nav.dropdown-left-center .dropdown-anchor:after {
+ top: -7px;
+ left: -8px;
+ right: auto;
+}
+
+.dropdown-menu-nav.dropdown-left-center .dropdown-anchor {
+ top: calc(50% - 8px);
+}
+
+/** 鍙充笂浣嶇疆 */
+.dropdown-menu-nav.dropdown-right-top {
+ left: 100%;
+ bottom: 0;
+}
+
+.dropdown-menu-nav.dropdown-right-top {
+ margin-left: 8px;
+}
+
+.dropdown-menu-nav.dropdown-right-top .dropdown-anchor, .dropdown-menu-nav.dropdown-right-top .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+ border-top-color: transparent;
+ left: -16px;
+}
+
+.dropdown-menu-nav.dropdown-right-top .dropdown-anchor:after {
+ top: -7px;
+ left: -6px;
+}
+
+.dropdown-menu-nav.dropdown-right-top .dropdown-anchor {
+ bottom: 12px;
+}
+
+/** 鍙充笅浣嶇疆 */
+.dropdown-menu-nav.dropdown-right-bottom {
+ left: 100%;
+ top: 0;
+}
+
+.dropdown-menu-nav.dropdown-right-bottom {
+ margin-left: 8px;
+}
+
+.dropdown-menu-nav.dropdown-right-bottom .dropdown-anchor, .dropdown-menu-nav.dropdown-right-bottom .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+ border-top-color: transparent;
+ left: -16px;
+}
+
+.dropdown-menu-nav.dropdown-right-bottom .dropdown-anchor:after {
+ top: -7px;
+ left: -6px;
+}
+
+.dropdown-menu-nav.dropdown-right-bottom .dropdown-anchor {
+ top: 12px;
+}
+
+/** 鍙充腑浣嶇疆 */
+.dropdown-menu-nav.dropdown-right-center {
+ left: 100%;
+ top: 50%;
+ /*transform: translateY(-50%);*/
+}
+
+.dropdown-menu-nav.dropdown-right-center {
+ margin-left: 8px;
+}
+
+.dropdown-menu-nav.dropdown-right-center .dropdown-anchor, .dropdown-menu-nav.dropdown-right-center .dropdown-anchor:after {
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+ border-top-color: transparent;
+ left: -16px;
+}
+
+.dropdown-menu-nav.dropdown-right-center .dropdown-anchor:after {
+ top: -7px;
+ left: -6px;
+}
+
+.dropdown-menu-nav.dropdown-right-center .dropdown-anchor {
+ top: calc(50% - 8px);
+}
+
+/** 鎸夐挳閲岄潰涓夎褰㈡牱寮� */
+.icon-btn .layui-icon-drop {
+ margin-right: 0;
+ font-size: 14px;
+}
+
+.layui-icon-drop:before {
+ content: "\e625";
+}
+
+.layui-icon-drop.top {
+ transform: rotate(180deg);
+ display: inline-table;
+}
+
+.layui-icon-drop.left {
+ transform: rotate(90deg);
+ display: inline-table;
+}
+
+.layui-icon-drop.right {
+ transform: rotate(-90deg);
+ display: inline-table;
+}
+
+/** 閫傞厤btn-container */
+.layui-btn-container .dropdown-menu .layui-btn {
+ margin: 0;
+}
+
+.layui-btn-container .dropdown-menu {
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+
+.dropdown-menu + .dropdown-menu, .layui-btn + .dropdown-menu, .dropdown-menu + .layui-btn {
+ margin-left: 10px;
+}
+
+.layui-btn-container input {
+ font-size: 14px;
+}
+
+/** 姘旀场纭妗� */
+.dropdown-popconfirm {
+ color: #555;
+ font-size: 14px;
+ max-width: 230px;
+ min-width: 200px;
+ width: max-content;
+ padding: 15px 15px;
+ box-sizing: border-box;
+ border: none;
+ border-radius: 4px;
+ box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
+}
+
+.dropdown-popconfirm .layui-icon-help, .dropdown-popconfirm .layui-icon-about {
+ font-size: 12px;
+ color: #fff;
+ height: 16px;
+ width: 16px;
+ line-height: 16px;
+ text-align: center;
+ display: inline-block;
+ box-sizing: border-box;
+ background-color: #FF9900;
+ border-radius: 50%;
+ margin: -2px 3px 0 0;
+ overflow: hidden;
+ vertical-align: middle;
+}
+
+.dropdown-popconfirm .layui-icon-about {
+ background-color: #FF0000;
+ position: relative;
+}
+
+.dropdown-popconfirm .layui-icon-about:before {
+ font-size: 28px;
+ position: absolute;
+ left: -6px;
+ top: 0;
+}
+
+.dropdown-popconfirm .dropdown-popconfirm-title > span {
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.dropdown-popconfirm .dropdown-popconfirm-btn {
+ margin-top: 12px;
+ text-align: right;
+}
+
+.dropdown-popconfirm .dropdown-popconfirm-btn .layui-btn {
+ height: 24px;
+ min-width: 45px;
+ line-height: 24px;
+ padding: 0;
+ font-size: 12px;
+ border-radius: 3px;
+}
+
+.dropdown-popconfirm .dropdown-popconfirm-btn .layui-btn[btn-cancel] {
+ color: #333;
+ background: transparent;
+}
diff --git a/src/main/webapp/static/layui/lay/modules/dropdown/dropdown.js b/src/main/webapp/static/layui/lay/modules/dropdown/dropdown.js
new file mode 100644
index 0000000..b05f3ac
--- /dev/null
+++ b/src/main/webapp/static/layui/lay/modules/dropdown/dropdown.js
@@ -0,0 +1,250 @@
+/** 涓嬫媺鑿滃崟妯″潡 date:2020-05-04 License By http://easyweb.vip */
+layui.define(['jquery'], function (exports) {
+ var $ = layui.jquery;
+ var openClass = 'dropdown-open';
+ var disableClass = 'dropdown-disabled';
+ var noScrollClass = 'dropdown-no-scroll';
+ var shadeClass = 'dropdown-menu-shade';
+ var dropdownClass = 'dropdown-menu';
+ var dropNavClass = 'dropdown-menu-nav';
+ var hoverClass = 'dropdown-hover';
+ var fixedClass = 'fixed';
+ var noShadeClass = 'no-shade';
+ var animClass = 'layui-anim layui-anim-upbit';
+ var popAnimClass = 'layui-anim layui-anim-fadein';
+ var dropDirect = ['bottom-left', 'bottom-right', 'bottom-center', 'top-left', 'top-right', 'top-center', 'left-top', 'left-bottom', 'left-center', 'right-top', 'right-bottom', 'right-center'];
+ if ($('#ew-css-dropdown').length <= 0) {
+ layui.link(layui.cache.base + 'dropdown/dropdown.css');
+ }
+
+ var dropdown = {
+ // 缁戝畾浜嬩欢
+ init: function () {
+ // 鐐瑰嚮瑙﹀彂
+ $(document).off('click.dropdown').on('click.dropdown', '.' + dropdownClass + '>*:first-child', function (event) {
+ var $drop = $(this).parent();
+ if (!$drop.hasClass(hoverClass)) {
+ if ($drop.hasClass(openClass)) {
+ $drop.removeClass(openClass);
+ } else {
+ dropdown.hideAll();
+ dropdown.show($(this).parent().find('.' + dropNavClass));
+ }
+ }
+ event.stopPropagation();
+ });
+ // 鐐瑰嚮浠讳綍浣嶇疆鍏抽棴鎵�鏈�
+ $(document).off('click.dropHide').on('click.dropHide', function (event) {
+ dropdown.hideAll();
+ });
+ // 鐐瑰嚮涓嬫媺鑿滃崟鍐呭閮ㄥ垎涓嶅叧闂�
+ $(document).off('click.dropNav').on('click.dropNav', '.' + dropNavClass, function (event) {
+ event.stopPropagation();
+ });
+ // hover瑙﹀彂
+ var timer, lastDrop, hoverSelector = '.' + dropdownClass + '.' + hoverClass;
+ $(document).off('mouseenter.dropdown').on('mouseenter.dropdown', hoverSelector, function (event) {
+ if (lastDrop && lastDrop == event.currentTarget) {
+ clearTimeout(timer);
+ }
+ dropdown.show($(this).find('.' + dropNavClass));
+ });
+ $(document).off('mouseleave.dropdown').on('mouseleave.dropdown', hoverSelector, function (event) {
+ lastDrop = event.currentTarget;
+ timer = setTimeout(function () {
+ $(event.currentTarget).removeClass(openClass);
+ }, 300);
+ });
+ // 鍒嗙寮忕粦瀹�
+ $(document).off('click.dropStand').on('click.dropStand', '[data-dropdown]', function (event) {
+ dropdown.showFixed($(this));
+ event.stopPropagation();
+ });
+ // 鏃犻檺绾у瓙鑿滃崟
+ var hoverNavSelector = '.' + dropNavClass + ' li';
+ $(document).off('mouseenter.dropdownNav').on('mouseenter.dropdownNav', hoverNavSelector, function (event) {
+ $(this).children('.dropdown-menu-nav-child').addClass(animClass);
+ $(this).addClass('active');
+ });
+ $(document).off('mouseleave.dropdownNav').on('mouseleave.dropdownNav', hoverNavSelector, function (event) {
+ $(this).removeClass('active');
+ $(this).find('li.active').removeClass('active');
+ });
+ // 姘旀场纭寮圭獥
+ $(document).off('click.popconfirm').on('click.popconfirm', '.dropdown-menu-nav [btn-cancel]', function (event) {
+ dropdown.hideAll();
+ event.stopPropagation();
+ });
+ },
+ // 鐐瑰嚮鑿滃崟鍏抽棴
+ openClickNavClose: function () {
+ $(document).off('click.dropNavA').on('click.dropNavA', '.' + dropNavClass + '>li>a', function (event) {
+ dropdown.hideAll();
+ $(this).parentsUntil('.' + dropdownClass).last().parent().removeClass(openClass);
+ event.stopPropagation();
+ });
+ },
+ // 鍏抽棴鎵�鏈�
+ hideAll: function () {
+ $('.' + dropdownClass).removeClass(openClass);
+ // 闅愯棌鍒嗙寮忚彍鍗�
+ $('.' + dropNavClass + '.' + fixedClass).addClass('layui-hide'); // 闅愯棌鍒嗙寮忚彍鍗�
+ $('.' + shadeClass).remove(); // 绉婚櫎閬僵灞�
+ $('body').removeClass(noScrollClass); // 绉婚櫎绂佹椤甸潰婊氬姩
+ $('.dropdown-fix-parent').removeClass('dropdown-fix-parent');
+ $('[data-dropdown]').removeClass(openClass);
+ },
+ // 灞曞紑闈炲垎绂诲紡涓嬫媺鑿滃崟
+ show: function ($dropNav) {
+ if ($dropNav && $dropNav.length > 0 && !$dropNav.hasClass(disableClass)) {
+ if ($dropNav.hasClass('dropdown-popconfirm')) {
+ $dropNav.removeClass(animClass);
+ $dropNav.addClass(popAnimClass);
+ } else {
+ $dropNav.removeClass(popAnimClass);
+ $dropNav.addClass(animClass);
+ }
+ var position; // 鑾峰彇浣嶇疆
+ for (var i = 0; i < dropDirect.length; i++) {
+ if ($dropNav.hasClass('dropdown-' + dropDirect[i])) {
+ position = dropDirect[i];
+ break;
+ }
+ }
+ if (!position) { // 娌℃湁璁剧疆浣嶇疆娣诲姞榛樿浣嶇疆
+ $dropNav.addClass('dropdown-' + dropDirect[0]);
+ position = dropDirect[0];
+ }
+ dropdown.forCenter($dropNav, position);
+ $dropNav.parent('.' + dropdownClass).addClass(openClass);
+ return position;
+ }
+ return false;
+ },
+ // 灞曞紑鍒嗙寮忚彍鍗�
+ showFixed: function ($trigger) {
+ var $dropNav = $($trigger.data('dropdown')), position;
+ if (!$dropNav.hasClass('layui-hide')) {
+ dropdown.hideAll(); // 宸茬粡灞曞紑鍒欓殣钘�
+ return;
+ }
+ dropdown.hideAll(); // 宸茬粡灞曞紑鍒欓殣钘�
+ position = dropdown.show($dropNav); // 鑾峰彇寮瑰嚭浣嶇疆
+ if (position) {
+ $dropNav.addClass(fixedClass); // 璁剧疆涓哄浐瀹氬畾浣�
+ $dropNav.removeClass('layui-hide'); // 鏄剧ず涓嬫媺鑿滃崟
+ var topLeft = dropdown.getTopLeft($trigger, $dropNav, position); // 璁＄畻鍧愭爣
+ topLeft = dropdown.checkPosition($dropNav, $trigger, position, topLeft); // 鏄惁婧㈠嚭灞忓箷
+ $dropNav.css(topLeft); // 璁剧疆鍧愭爣
+ $('body').addClass(noScrollClass); // 绂佹椤甸潰婊氬姩
+ var hideShade = ($trigger.attr('no-shade') == 'true'); // 鏄惁闅愯棌閬僵灞�
+ $('body').append('<div class="' + (hideShade ? (shadeClass + ' ' + noShadeClass) : shadeClass) + ' layui-anim layui-anim-fadein"></div>'); // 娣诲姞閬僵灞�
+ // 閲嶇疆鐖跺厓绱爖-index
+ $trigger.parentsUntil('body').each(function () {
+ var zIndex = $(this).css('z-index');
+ if (/[0-9]+/.test(zIndex)) {
+ $(this).addClass('dropdown-fix-parent');
+ }
+ });
+ $trigger.addClass(openClass);
+ }
+ },
+ // 瑙ｅ喅缁濆瀹氫綅鍥犲姩鐢诲鑷村钩绉诲け鏁�
+ forCenter: function ($dropNav, position) {
+ if (!$dropNav.hasClass(fixedClass)) {
+ var wTrigger = $dropNav.parent().outerWidth(), hTrigger = $dropNav.parent().outerHeight();
+ var wDrop = $dropNav.outerWidth(), hDrop = $dropNav.outerHeight();
+ var pParts = position.split('-'), dropSide = pParts[0], dropPosition = pParts[1]; // 鏄剧ず鏂瑰悜
+ if ((dropSide == 'top' || dropSide == 'bottom') && dropPosition == 'center') {
+ $dropNav.css('left', (wTrigger - wDrop) / 2);
+ }
+ if ((dropSide == 'left' || dropSide == 'right') && dropPosition == 'center') {
+ $dropNav.css('top', (hTrigger - hDrop) / 2);
+ }
+ }
+ },
+ // 璁＄畻鍥哄畾瀹氫綅鍧愭爣
+ getTopLeft: function ($trigger, $dropdown, position) {
+ var widthTrigger = $trigger.outerWidth();
+ var heightTrigger = $trigger.outerHeight();
+ var widthDropdown = $dropdown.outerWidth();
+ var heightDropdown = $dropdown.outerHeight();
+ var topTrigger = $trigger.offset().top - $(document).scrollTop();
+ var leftTrigger = $trigger.offset().left;
+ var rightTrigger = leftTrigger + widthTrigger;
+ var top = 0, left = 0;
+ var positionParts = position.split('-');
+ var anchorSide = positionParts[0]; // 绠ご浣嶇疆
+ var anchorPosition = positionParts[1]; // 绠ご鏂瑰悜
+ if (anchorSide == 'top' || anchorSide == 'bottom') {
+ heightDropdown += 8; // 鍔犱笂margin璺濈
+ switch (anchorPosition) {
+ case 'left':
+ left = leftTrigger;
+ break;
+ case 'center':
+ left = leftTrigger - widthDropdown / 2 + widthTrigger / 2;
+ break;
+ case 'right':
+ left = rightTrigger - widthDropdown;
+ }
+ }
+ if (anchorSide == 'left' || anchorSide == 'right') {
+ widthDropdown += 8; // 鍔犱笂margin璺濈
+ switch (anchorPosition) {
+ case 'top':
+ top = topTrigger + heightTrigger - heightDropdown;
+ break;
+ case 'center':
+ top = topTrigger - heightDropdown / 2 + heightTrigger / 2;
+ break;
+ case 'bottom':
+ top = topTrigger;
+ }
+ }
+ switch (anchorSide) {
+ case 'top':
+ top = topTrigger - heightDropdown;
+ break;
+ case 'right':
+ left = leftTrigger + widthTrigger;
+ break;
+ case 'bottom':
+ top = topTrigger + heightTrigger;
+ break;
+ case 'left':
+ left = leftTrigger - widthDropdown;
+ }
+ return {top: top, left: left, right: 'auto', bottom: 'auto'};
+ },
+ // 妫�鏌ユ槸鍚︽孩鍑哄睆骞�
+ checkPosition: function ($dropNav, $trigger, position, topLeft) {
+ var aps = position.split('-');
+ if ('bottom' == aps[0]) {
+ if ((topLeft.top + $dropNav.outerHeight()) > dropdown.getPageHeight()) {
+ topLeft = dropdown.getTopLeft($trigger, $dropNav, 'top-' + aps[1]);
+ $dropNav.removeClass('dropdown-' + position);
+ $dropNav.addClass('dropdown-top-' + aps[1]);
+ }
+ } else if ('top' == aps[0]) {
+ if (topLeft.top < 0) {
+ topLeft = dropdown.getTopLeft($trigger, $dropNav, 'bottom-' + aps[1]);
+ $dropNav.removeClass('dropdown-' + position);
+ $dropNav.addClass('dropdown-bottom-' + aps[1]);
+ }
+ }
+ return topLeft;
+ },
+ // 鑾峰彇娴忚鍣ㄩ珮搴�
+ getPageHeight: function () {
+ return document.documentElement.clientHeight || document.body.clientHeight;
+ },
+ // 鑾峰彇娴忚鍣ㄥ搴�
+ getPageWidth: function () {
+ return document.documentElement.clientWidth || document.body.clientWidth;
+ }
+ };
+
+ dropdown.init();
+ exports('dropdown', dropdown);
+});
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..eba9ade
--- /dev/null
+++ b/src/main/webapp/views/ste.html
@@ -0,0 +1,228 @@
+<!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" type="text/css" href="../static/layui/css/layui.css">
+ <link rel="stylesheet" href="../static/css/ste.css">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/layer/layer.js"></script>
+ <script type="text/javascript" src="../static/layui/layui.js"></script>
+ <script type="text/javascript" src="../static/js/common.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>
+ <div class="dropdown-menu">
+ <button id="steBtn-1" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
+ <ul class="dropdown-menu-nav dark" >
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
+ <div class="form-item"><span>鎺掞細</span><input type="text"></div>
+ <div class="form-item"><span>鍒楋細</span><input type="text"></div>
+ <div class="form-item"><span>灞傦細</span><input type="text"></div>
+ </ul>
+ </div>
+ <div class="dropdown-menu">
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ <ul class="dropdown-menu-nav dark">
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
+ </ul>
+ </div>
+ </div>
+ <div class="ste-command-item" style="margin-top: 25px">
+ <label>2#</label>
+ <div class="dropdown-menu">
+ <button id="steBtn-2" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
+ <ul class="dropdown-menu-nav dark" >
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
+ <div class="form-item"><span>鎺掞細</span><input type="text"></div>
+ <div class="form-item"><span>鍒楋細</span><input type="text"></div>
+ <div class="form-item"><span>灞傦細</span><input type="text"></div>
+ </ul>
+ </div>
+ <div class="dropdown-menu">
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ <ul class="dropdown-menu-nav dark">
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
+ </ul>
+ </div>
+ </div>
+ <div class="ste-command-item" style="margin-top: 25px">
+ <label>3#</label>
+ <div class="dropdown-menu">
+ <button id="steBtn-3" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
+ <ul class="dropdown-menu-nav dark" >
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
+ <div class="form-item"><span>鎺掞細</span><input type="text"></div>
+ <div class="form-item"><span>鍒楋細</span><input type="text"></div>
+ <div class="form-item"><span>灞傦細</span><input type="text"></div>
+ </ul>
+ </div>
+ <div class="dropdown-menu">
+ <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
+ <ul class="dropdown-menu-nav dark">
+ <div class="dropdown-anchor"></div>
+ <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
+ </ul>
+ </div>
+ </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="leftTake()">宸﹀嚭搴�</button>
+ <button class="item" onclick="rightTake()">鍙冲嚭搴�</button>
+ <button class="item" onclick="leftPut()">宸﹀叆搴�</button>
+ <button class="item" onclick="rightPut()">鍙冲叆搴�</button>
+ <button class="item" onclick="leftStockMove()">宸︾Щ搴�</button>
+ <button class="item" onclick="rightStockMove()">鍙崇Щ搴�</button>
+ <button class="item" onclick="oOrigin()">鍘熺偣</button>
+ <button class="item" onclick="farPoint()">杩滅偣</button>
+ <button class="item" onclick="aPoint()">A 鐐�</button>
+ <button class="item" onclick="bPoint()">B 鐐�</button>
+ <button class="item" onclick="moveLift()">宸︽惉绉�</button>
+ <button class="item" onclick="moveRight()">鍙虫惉绉�</button>
+ <button class="item" onclick="charging()">鍏呯數</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>
+ layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+ }).extend({
+ dropdown: 'dropdown/dropdown',
+ }).use(['dropdown'],function () {
+ var dropdown = layui.dropdown;
+ })
+</script>
+<script>
+ // 淇敼绌挎杞︿綅缃�
+ function changePosition(id) {
+ console.log(id)
+ // $.ajax({
+ // url: baseUrl +
+ // })
+ }
+ // 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
+
+ function getSteStateInfo() {
+ var tableEl = $('ste-state-table');
+ $.ajax({
+ url: baseUrl + "/crn/table/crn/state",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ console.log(res)
+
+ }
+ })
+ }
+ setInterval(function () {
+ getSteStateInfo()
+ },1000)
+</script>
\ No newline at end of file
--
Gitblit v1.9.1