From 6abc20e29568c129f4ca71eccec9310534a8c779 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 04 八月 2020 14:42:24 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index e39cd89..abbf01c 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -11,6 +11,7 @@
     <link rel="stylesheet" type="text/css" href="../static/css/crn.css">
     <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
     <script type="text/javascript" src="../static/js/common.js"></script>
+    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
     <style>
 
     </style>
@@ -81,6 +82,7 @@
 <!-- 鎵嬪姩鎿嶄綔 -->
 <div class="crn-operation">
 
+    <!-- 閬僵灞� -->
     <div class="crn-operation-shade">
         <span class="crn-operation-shade-span">
             WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
@@ -198,7 +200,7 @@
 
     // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
     function operatorBlockShow() {
-        if (top.systemRunning) {
+        if (parent.systemRunning) {
             $('.crn-operation').css("opacity", "0.5");
             $('.crn-operation-shade').show();
             $('.crn-operation-shade-span').show();
@@ -222,14 +224,13 @@
                         $("#crn"+commands[i].crnNo).val(commands[i].command);
                     }
                 } else if (res.code === 403) {
-                    top.location.href = baseUrl + "/login";
+                    window.location.href = baseUrl + "/login";
                 } else {
                     alert(res.msg);
                 }
             }
         })
     }
-
 
     // 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
     function getCrnStateInfo() {
@@ -262,7 +263,7 @@
                         setVal(tr.children("td").eq(12), table[i-1].warnCode);
                     }
                 } else if (res.code === 403){
-                    top.location.href = baseUrl+"/login";
+                    window.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -298,7 +299,7 @@
                         setVal(tr.children("td").eq(9), table[i-1].command);
                     }
                 } else if (res.code === 403){
-                    top.location.href = baseUrl+"/login";
+                    window.location.href = baseUrl+"/login";
                 }  else {
                     alert(res.msg);
                 }
@@ -334,70 +335,70 @@
     // 鍏ュ簱
     function put() {
         http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 鍑哄簱
     function take() {
         http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 搴撲綅杞Щ
     function stockMove() {
         http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 绔欏埌绔�
     function siteMove() {
         http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 鍧愭爣绉诲姩
     function coorMove() {
         http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 鍥炲師鐐�
     function bacOrigin() {
         http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 浠诲姟瀹屾垚
     function taskComplete() {
         http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 鏆傚仠
     function pause() {
         http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 鍚姩
     function boot() {
         http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
     // 娓呴櫎鍛戒护
     function clearCommand() {
         http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
-            alert(res.msg);
+            layer.msg(res.msg);
         });
     }
 
@@ -411,7 +412,7 @@
                 if (res.code === 200) {
                     crnOutput(res.data);
                 } else if (res.code === 403) {
-                    top.location.href = baseUrl + "/login";
+                    window.location.href = baseUrl + "/login";
                 } else {
                     alert(res.msg);
                 }

--
Gitblit v1.9.1