From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |  157 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 126 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 4e761e7..4747862 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -13,7 +13,31 @@
     <script type="text/javascript" src="../static/js/common.js"></script>
     <script type="text/javascript" src="../static/js/layer/layer.js"></script>
     <style>
+        .demoBtn {
+            vertical-align: middle;
+            width: 20%;
+            height: 25px;
+            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;
+        }
     </style>
 </head>
 <body>
@@ -24,14 +48,16 @@
         <h2>鎵ц涓殑鍛戒护</h2>
         <div class="crn-command-item">
             <label>1#</label>
-            <span>&nbsp;</span>
+            <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>
+            <!--            <span>&nbsp;</span>-->
             <input id="crn1" disabled="disabled">
         </div>
-<!--        <div class="crn-command-item">-->
-<!--            <label>2#</label>-->
-<!--            <span>&nbsp;</span>-->
-<!--            <input id="crn2" disabled="disabled">-->
-<!--        </div>-->
+        <div class="crn-command-item">
+            <label>2#</label>
+            <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>
+            <!--            <span>&nbsp;</span>-->
+            <input id="crn2" disabled="disabled">
+        </div>
     </div>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
     <div class="crn-state">
@@ -39,15 +65,18 @@
             <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>
+                    <th>寮傚父鐮�</th>
                 </tr>
             </thead>
             <tbody>
@@ -67,6 +96,14 @@
                 <th>鐩爣绔�</th>
                 <th>婧愬簱浣�</th>
                 <th>鐩爣搴撲綅</th>
+                <th>寮傚父</th>
+                <th>璧拌閫熷害锛坢/min)</th>
+                <th>鍗囬檷閫熷害锛坢/min)</th>
+                <th>鍙夌墮閫熷害锛坢/min)</th>
+                <th>璧拌璺濈(Km)</th>
+                <th>鍗囬檷璺濈(Km)</th>
+                <th>璧拌鏃堕暱(H)</th>
+                <th>鍗囬檷鏃堕暱(H)</th>
             </tr>
         </thead>
         <tbody>
@@ -103,15 +140,15 @@
                 </div>
                 <div class="select-container-item">
                     <span>鎺�</span>
-                    <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+                    <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" /></label>
+                    <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="0" style="background-color: #a9eeff" /></label>
+                    <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                 </div>
             </div>
         </div>
@@ -125,15 +162,15 @@
                 </div>
                 <div class="select-container-item">
                     <span>鎺�</span>
-                    <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+                    <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" /></label>
+                    <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="0" style="background-color: #a9eeff" /></label>
+                    <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                 </div>
             </div>
         </div>
@@ -148,9 +185,9 @@
                 <button class="item" onclick="take()">鍑哄簱</button>
                 <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
                 <button class="item" onclick="siteMove()">绔欏埌绔�</button>
-                <button class="item" onclick="coorMove()">鍧愭爣绉诲姩</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>-->
@@ -190,7 +227,7 @@
         getCommandLog();
     },1000);
     setInterval(function () {
-        getSiteOutput();
+        getCrnOutput();
         operatorBlockShow();
     },500);
 
@@ -222,7 +259,7 @@
                 } else if (res.code === 403) {
                     window.location.href = baseUrl + "/login";
                 } else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         })
@@ -245,20 +282,23 @@
                     for (var i=1;i<=table.length;i++){
                         var tr = tableEl.find("tr").eq(i);
                         setVal(tr.children("td").eq(0), table[i-1].crnNo);
-                        setVal(tr.children("td").eq(1), table[i-1].workNo);
-                        setVal(tr.children("td").eq(2), table[i-1].statusType);
-                        setVal(tr.children("td").eq(3), table[i-1].status);
-                        setVal(tr.children("td").eq(4), table[i-1].warn);
-                        setVal(tr.children("td").eq(5), table[i-1].loading);
-                        setVal(tr.children("td").eq(6), table[i-1].bay);
-                        setVal(tr.children("td").eq(7), table[i-1].lev);
+                        setVal(tr.children("td").eq(1), table[i-1].statusType);
+                        setVal(tr.children("td").eq(2), table[i-1].status);
+                        setVal(tr.children("td").eq(3), table[i-1].loading);
+                        setVal(tr.children("td").eq(4), table[i-1].bay);
+                        setVal(tr.children("td").eq(5), table[i-1].lev);
+                        setVal(tr.children("td").eq(6), table[i-1].xorigin);
+                        setVal(tr.children("td").eq(7), table[i-1].yorigin);
                         setVal(tr.children("td").eq(8), table[i-1].forkOffset);
-                        setVal(tr.children("td").eq(9), table[i-1].liftPos);
+                        setVal(tr.children("td").eq(9), table[i-1].xlocation);
+                        setVal(tr.children("td").eq(10), table[i-1].ylocation);
+                        setVal(tr.children("td").eq(11), table[i-1].stop);
+                        setVal(tr.children("td").eq(12), table[i-1].warnCode);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -287,11 +327,19 @@
                         setVal(tr.children("td").eq(4), table[i-1].staNo);
                         setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
                         setVal(tr.children("td").eq(6), table[i-1].locNo);
+                        setVal(tr.children("td").eq(7), table[i-1].error);
+                        setVal(tr.children("td").eq(8), table[i-1].xspeed);
+                        setVal(tr.children("td").eq(9), table[i-1].yspeed);
+                        setVal(tr.children("td").eq(10), table[i-1].zspeed);
+                        setVal(tr.children("td").eq(11), table[i-1].xdistance);
+                        setVal(tr.children("td").eq(12), table[i-1].ydistance);
+                        setVal(tr.children("td").eq(13), table[i-1].xduration);
+                        setVal(tr.children("td").eq(14), table[i-1].yduration);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -401,13 +449,13 @@
 
     // 鎵嬪姩澶嶄綅
     function handleReset() {
-        http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+        http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
             layer.msg(res.msg);
         });
     }
 
     // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
-    function getSiteOutput() {
+    function getCrnOutput() {
         $.ajax({
             url: baseUrl + "/crn/output/site",
             headers: {'token': localStorage.getItem('token')},
@@ -418,7 +466,7 @@
                 } else if (res.code === 403) {
                     window.location.href = baseUrl + "/login";
                 } else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         })
@@ -442,6 +490,9 @@
         var html = "";
         for (var i = 0; i < line; i ++){
             html += " <tr>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
@@ -480,6 +531,14 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-msg-table tbody').after(html);
@@ -491,5 +550,41 @@
         crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
     }
 
+    function demoSwitch(el) {
+        var crnId = el.split("-")[1];
+        layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺紑濮�'+crnId+"鍙峰爢鍨涙満婕旂ず", formType: 1, shadeClose: true}, function (pass, idx) {
+            layer.close(idx);
+            doDemo(crnId, pass); // 鍋滄wcs绯荤粺
+        });
+    }
+
+    function doDemo(crnId, password) {
+        // 鍔犺浇tips
+        var index = layer.load(1, {
+            shade: [0.1,'#fff']
+        });
+        $.ajax({
+            url: baseUrl+ "/crn/demo/switch",
+            headers: {'token': localStorage.getItem('token')},
+            // async: false,
+            data: {
+                crnId: Number(crnId),
+                password: password
+            },
+            method: 'POST',
+            success: function (res) {
+                layer.close(index);
+                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});
+                }
+            }
+        });
+
+    }
+
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1