From da7d75a235969e1fcc55d55189f8d30867ea1cfc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 13:40:49 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 5d08665..3d4f323 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -48,9 +48,15 @@
         <h2>鎵ц涓殑鍛戒护</h2>
         <div class="crn-command-item">
             <label>1#</label>
-            <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>
-            <!--            <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>
+<!--            <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>-->
+                        <span>&nbsp;</span>
+            <input id="crn2" disabled="disabled">
         </div>
     </div>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -179,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="bacOrigin()">鍥炲師鐐�</button>
-                <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</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>-->
@@ -544,11 +550,18 @@
         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 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绯荤粺
+        layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾寮�濮嬫紨绀哄悧锛�', function(){
+            doDemo(crnId, 'root'); // 鍋滄wcs绯荤粺
         });
     }
 

--
Gitblit v1.9.1