From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器

---
 src/main/webapp/views/rgv.html |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index b679a84..8d8032c 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -102,6 +102,7 @@
 <!--                        <th>鏈夌墿2</th>-->
                         <th>鏁呴殰浠g爜</th>
                         <th>鏁呴殰鎻忚堪</th>
+                        <th>閿佸畾鐘舵��</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -151,7 +152,8 @@
                     <span class="select-title">RGV鍙�</span>
                     <div class="select-container" style="padding: 20px 0;">
                         <label><input type="radio" name="rgvSelect" value="1" checked>&nbsp;1鍙稲GV</label>
-                        <label><input type="radio" name="rgvSelect" value="2">&nbsp;2鍙稲GV</label>
+<!--                        <label><input type="radio" name="rgvSelect" value="2">&nbsp;2鍙稲GV</label>-->
+<!--                        <label><input type="radio" name="rgvSelect" value="3">&nbsp;3鍙稲GV</label>-->
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -166,10 +168,10 @@
 <!--                            <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>宸ヤ綅2婧愮珯</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>宸ヤ綅2婧愮珯</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>-->
@@ -188,10 +190,10 @@
 <!--                            <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>宸ヤ綅2鐩爣绔�</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>宸ヤ綅2鐩爣绔�</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>-->
@@ -206,17 +208,18 @@
                     <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="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="lock()">瑙i攣</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>
+<!--                        <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
+<!--                        <button class="item" onclick="handleReset()">澶嶄綅</button>-->
                     </div>
                 </fieldset>
             </div>
@@ -322,6 +325,7 @@
                         // setVal(tr.children("td").eq(10), table[i-1].loading2);
                         setVal(tr.children("td").eq(8), table[i-1].warnCode);
                         setVal(tr.children("td").eq(9), table[i-1].alarm);
+                        setVal(tr.children("td").eq(10), table[i-1].pakMk);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -453,6 +457,12 @@
         });
     }
 
+    function lock() {
+        http.post(baseUrl+"/rgv/lock", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
     // 鏆傚仠
     function pause() {
         http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {

--
Gitblit v1.9.1