From 4e1a8e484888b3d3f28dc9629904e6e54d90ebc5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 28 七月 2023 16:26:40 +0800
Subject: [PATCH] 穿梭车命令封装

---
 src/main/webapp/views/shuttle.html |   69 +++++++++++++++-------------------
 1 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index d5be706..fda3c72 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -70,6 +70,7 @@
                             <th>鎬荤數閲�</th>
                             <th>鎬婚噷绋嬫暟</th>
                             <th>浣滀笟鏍囪</th>
+                            <th>褰撳墠搴撲綅</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -114,8 +115,7 @@
                                         </div>
 
                                         <div style="margin-top: 10px;">
-                                            <button class="item" onclick="shuttleOperator(1)">鍏ュ簱</button>
-                                            <button class="item" onclick="shuttleOperator(2)">鍑哄簱</button>
+                                            <button class="item" onclick="shuttleOperator(18)">鎼繍璐х墿</button>
                                             <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
                                             <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>
                                         </div>
@@ -130,50 +130,42 @@
                                         <div class="button-group">
                                             <button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
                                             <button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
-                                            <button class="item" onclick="shuttleOperator(5)">宸︾Щ</button>
-                                            <button class="item" onclick="shuttleOperator(6)">鍙崇Щ</button>
-                                            <button class="item" onclick="shuttleOperator(7)">鍚庣Щ</button>
-                                            <button class="item" onclick="shuttleOperator(8)">鍓嶇Щ</button>
-                                            <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
-                                            <button class="item" onclick="shuttleOperator(10)">姝f柟鍚�(鍙�)瀵诲簱浣�</button>
-                                            <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(宸�)瀵诲簱浣�</button>
-                                            <button class="item" onclick="shuttleOperator(12)">姝f柟鍚�(鍓�)瀵诲簱浣�</button>
-                                            <button class="item" onclick="shuttleOperator(13)">璐熸柟鍚�(鍚�)瀵诲簱浣�</button>
                                             <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
+                                            <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
                                         </div>
                                     </div>
                                 </div>
                             </div>
 
-                            <div style="width: 20%;">
-                                <div class="operator-item" style="height: auto;width: 100%;">
-                                    <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>
-                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
-                                        <div class="select-container-item">
-                                            <span>杩愯閫熷害</span>
-                                            <label><input id="runSpeed" type="text" name="runSpeed" /></label>
-                                        </div>
-                                        <div class="select-container-item">
-                                            <span>鍏呯數闃堝��</span>
-                                            <label><input id="chargeLine" type="text" name="runSpeed" /></label>
-                                        </div>
+<!--                            <div style="width: 20%;">-->
+<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
+<!--                                    <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>-->
+<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
+<!--                                        <div class="select-container-item">-->
+<!--                                            <span>杩愯閫熷害</span>-->
+<!--                                            <label><input id="runSpeed" type="text" name="runSpeed" /></label>-->
+<!--                                        </div>-->
+<!--                                        <div class="select-container-item">-->
+<!--                                            <span>鍏呯數闃堝��</span>-->
+<!--                                            <label><input id="chargeLine" type="text" name="runSpeed" /></label>-->
+<!--                                        </div>-->
 
-                                        <div>
-                                            <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+<!--                                        <div>-->
+<!--                                            <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
 
-                            <div style="width: 15%;">
-                                <div class="operator-item" style="height: auto;width: 100%;">
-                                    <span class="select-title">閰嶇疆鍙傛暟</span>
-                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
-                                        <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>
-                                        <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>
-                                    </div>
-                                </div>
-                            </div>
+<!--                            <div style="width: 15%;">-->
+<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
+<!--                                    <span class="select-title">閰嶇疆鍙傛暟</span>-->
+<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
+<!--                                        <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>-->
+<!--                                        <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
                         </div>
                     </fieldset>
                 </div>
@@ -378,6 +370,7 @@
                         setVal(tr.children("td").eq(9), table[i-1].countQuantity);
                         setVal(tr.children("td").eq(10), table[i-1].statusSum.mileage);
                         setVal(tr.children("td").eq(11), table[i-1].pakMk$);
+                        setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
                         if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
                             $("#runSpeedText").text(table[i-1].runSpeed)
                             $("#chargeLineText").text(table[i-1].chargeLine + "%")

--
Gitblit v1.9.1