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/crn.html | 334 +++++++++++++++++++++++++++----------------------------
1 files changed, 164 insertions(+), 170 deletions(-)
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>
--
Gitblit v1.9.1