Authored by xwx

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -551,7 +551,7 @@ layui.extend({ @@ -551,7 +551,7 @@ layui.extend({
551 toastType: toastType, 551 toastType: toastType,
552 type: 'click', 552 type: 'click',
553 action: function () { 553 action: function () {
554 - if (hash && hash != '' && hash != null) { 554 + if (hash && hash != '' && hash != null && hash != 'null') {
555 if (hash.toLowerCase().indexOf("http://") != -1 && hash.toLowerCase().indexOf("https://") != -1) { 555 if (hash.toLowerCase().indexOf("http://") != -1 && hash.toLowerCase().indexOf("https://") != -1) {
556 location.hash = hash; 556 location.hash = hash;
557 } else { 557 } else {