From baf11d9f195732cfc0cc45a66b58ec2c1633cd4d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 七月 2023 09:03:11 +0800
Subject: [PATCH] command write

---
 src/main/webapp/views/pipeline.html |   61 +++++++++++++++---------------
 1 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 6415b2f..d8b85a2 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -15,7 +15,7 @@
     <style>
         .io-mode-box {
             float: left;
-            width: 25%;
+            /*width: 25%;*/
             text-align: center;
         }
         .io-mode-box label {
@@ -23,7 +23,7 @@
         }
         .ioModeBtn {
             vertical-align: middle;
-            width: 50%;
+            width: 25%;
             height: 30px;
             left: 0;
             top: 0;
@@ -62,14 +62,6 @@
                             <div class="io-mode-box">
                                 <label>1#</label>
                                 <button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>2#</label>
-                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>3#</label>
-                                <button id="io-mode-3" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
                             </div>
                         </fieldset>
                     </div>
@@ -110,6 +102,8 @@
                         <th>鍏ュ簱鏍囪</th>
                         <th>绌烘澘淇″彿</th>
                         <th>鐩爣绔�</th>
+                        <th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
+                        <th>绌挎杞﹀彲鍙栦俊鍙�</th>
                     </tr>
                     </thead>
                     <!-- 琛ㄦ牸鍐呭 -->
@@ -214,28 +208,29 @@
         if (ioModeData != null && ioModeData.length > 1) {
             ioModeData.forEach(function(e) {
                 if (e.floor === Number(floor)) {
-                    console.log()
-                    layer.confirm('纭畾鍒囨崲鍏呯數鐘舵�佸悧锛�',function () {
-                        $.ajax({
-                            url: baseUrl+ "/site/io/mode/action/site",
-                            headers: {'token': localStorage.getItem('token')},
-                            data: {
-                                floor: e.floor,
-                                charge: !e.modeVal
-                            },
-                            method: 'POST',
-                            success: function (res) {
-                                if (res.code === 200){
-                                    layer.msg("鎿嶄綔鎴愬姛锛岃鑰愬績绛夊緟涓�鍒嗛挓", {icon: 1})
-                                } else if (res.code === 403){
-                                    window.location.href = baseUrl+"/login";
-                                }  else {
-                                    console.log(res.msg);
+                    if (e.modeVal) {
+                        layer.confirm('纭畾鏂紑鍏呯數骞跺浣嶅悧锛�',function () {
+                            $.ajax({
+                                url: baseUrl+ "/site/io/mode/action/site",
+                                headers: {'token': localStorage.getItem('token')},
+                                data: {
+                                    floor: e.floor,
+                                    charge: !e.modeVal
+                                },
+                                method: 'POST',
+                                success: function (res) {
+                                    if (res.code === 200){
+                                        layer.msg(res.msg, {icon: 1})
+                                    } else if (res.code === 403){
+                                        window.location.href = baseUrl+"/login";
+                                    }  else {
+                                        layer.msg(res.msg, {icon: 2})
+                                    }
                                 }
-                            }
-                        });
-                        layer.closeAll();
-                    })
+                            });
+                            layer.closeAll();
+                        })
+                    }
                 }
             });
         }
@@ -294,6 +289,8 @@
                         setVal(tr.children("td").eq(6), table[i-1].pakMk);
                         setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                         setVal(tr.children("td").eq(8), table[i-1].staNo);
+                        setVal(tr.children("td").eq(9), table[i-1].liftArrival);
+                        setVal(tr.children("td").eq(10), table[i-1].shuttleTakeEnable);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -379,6 +376,8 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#site-table tbody').after(html);

--
Gitblit v1.9.1