From aa7c4ba35f1201615c18e47e54899a873eea28d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:44:28 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/stkPlcm/stkPlcm.js |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/stkPlcm/stkPlcm.js b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
index 867a60e..6e70a8c 100644
--- a/src/main/webapp/static/js/stkPlcm/stkPlcm.js
+++ b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
@@ -21,7 +21,7 @@
             ,{field: 'ioTime$', align: 'center',title: '鏃ユ湡'}
             ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
-            ,{field: 'crnError$', align: 'center',title: '寮傚父鐮�',event: 'crnError', style: 'cursor:pointer'}
+            ,{field: 'crnError$', align: 'center',title: '寮傚父鐮�'}
             ,{field: 'modiTime$', align: 'center',title: '寮傚父鏃堕棿'}
             ,{field: 'devNo$', align: 'center',title: '鍫嗗灈鏈哄彿',event: 'devNo', style: 'cursor:pointer'}
             ,{field: 'wrkTime$', align: 'center',title: '宸ヤ綔妗f椂闂�'}
@@ -45,7 +45,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -75,7 +75,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -127,7 +127,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = "/";
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -137,7 +137,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -166,7 +166,7 @@
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
-                                top.location.href = "/";
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -454,7 +454,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -524,7 +524,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1