diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index f677003..885d987 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -281,17 +281,10 @@
if (!col) {
return "";
}
- console.log(col)
- var items = this.cfg.items[col.split(".")[0]];
+ let items = this.cfg.items[col.split(".")[0]];
if (items) {
return items[col.split(".")[1]]['label']
- /*for (var i = 0; i < items.items.length; i++) {
- if (tableInfo.items[i].name == col.split("$")[1]) {
- return tableInfo.items[i].label;
- }
- }*/
-
}
return '';
},
diff --git a/root/res/js/red.js b/root/res/js/red.js
index 63b43a7..ae54fa8 100644
--- a/root/res/js/red.js
+++ b/root/res/js/red.js
@@ -181,9 +181,9 @@ var red = {
},
loginCheck: function (json) {
if (json && (json['code'] == -2 || json['referid'])) {
- //red.showMsg({type:'error', placement: 'center', msg: '登陆过期,请前往登陆'});
+ red.showMsg({type:'error', placement: 'center', msg: '登陆过期,请前往登陆'});
setTimeout(function () {
- //location.href = "/user/login.html";
+ location.href = "/user/login.html";
}, 2000);
}
},