From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/stkPlcm/stkPlcm.js | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/stkPlcm/stkPlcm.js b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
index e6ccaa4..e9e1e00 100644
--- a/src/main/webapp/static/js/stkPlcm/stkPlcm.js
+++ b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
@@ -10,18 +10,18 @@
tableIns = table.render({
elem: '#stkPlcm',
headers: {token: localStorage.getItem('token')},
- url: '/stkPlcm/list/auth',
+ url: baseUrl+'/stkPlcm/list/auth',
page: true,
limit: 10,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'ioTime$', align: 'center',title: '鏃ユ湡'}
+ // {type: 'checkbox'}
+ {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: '宸ヤ綔妗ｆ椂闂�'}
@@ -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();
@@ -117,7 +117,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: "/stkPlcm/delete/auth",
+ url: baseUrl+"/stkPlcm/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
@@ -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) {
@@ -155,7 +155,7 @@
'fields': fields
};
$.ajax({
- url: "/stkPlcm/export/auth",
+ url: baseUrl+"/stkPlcm/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -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)
}
@@ -234,7 +234,7 @@
content: '../locMast/locMast_detail.html',
success: function(layero, index){
$.ajax({
- url: "/locMast/"+ param +"/auth",
+ url: baseUrl+"/locMast/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -270,7 +270,7 @@
content: '../basCrnError/basCrnError_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basCrnError/"+ param +"/auth",
+ url: baseUrl+"/basCrnError/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -306,7 +306,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -342,7 +342,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -378,7 +378,7 @@
content: '../basCrnp/basCrnp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basCrnp/"+ param +"/auth",
+ url: baseUrl+"/basCrnp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -442,7 +442,7 @@
};
$.ajax({
- url: "/stkPlcm/"+name+"/auth",
+ url: baseUrl+"/stkPlcm/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -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