在登录界面展现之前加个心跳测试，正确判断后台服务能否访问

o2web/source/o2_core/o2/lp/en.js

@@ -504,7 +504,8 @@ o2.LP.authentication = {
 	"inputYourNewPassword" : "Enter a new password",
 	"changePasswordSuccess" : "Successfully change password",
 	"userAppCameraHtml" : "<div>open <div styles='bindTipLinkArea'>APP </div> and scan</div>",
-	"loginToPage": "Login to the page"
+	"loginToPage": "Login to the page",
+	"accessError": "Failed to access background service"
 
 };
 o2.LP.script = {

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -510,7 +510,8 @@ o2.LP.authentication = {
     "inputYourNewPassword" : "请输入新密码",
     "changePasswordSuccess" : "修改密码成功",
     "userAppCameraHtml" : "<div>打开<div styles='bindTipLinkArea'>APP</div>扫一扫</div>",
-    "loginToPage": "登录网页版"
+    "loginToPage": "登录网页版",
+    "accessError": "访问后台服务失败"
 
 };
 o2.LP.script = {

o2web/source/o2_core/o2/xDesktop/Authentication.js

@@ -46,46 +46,62 @@ MWF.xDesktop.Authentication = new Class({
     },
 
     loadLogin: function (node) {
-        if(node)this.loginNode = node;
-        if( !node && this.loginNode )node = this.loginNode;
-        if (layout.config.loginPage && layout.config.loginPage.enable && layout.config.loginPage.portal) {
-            MWF.xDesktop.loadPortal(layout.config.loginPage.portal, this.options.loginParameter);
-            this.fireEvent("openLogin");
-        } else {
-            this.popupOptions = {
-                "draggable": false,
-                "closeAction": false,
-                "hasMask": false,
-                "relativeToApp": false
-            };
-            this.popupPara = {
-                container: node
-            };
-            this.postLogin = function (json) {
-                layout.desktop.session.user = json.data;
-                layout.session.user = json.data;
-                layout.session.token = layout.session.user.token;
-                var user = layout.desktop.session.user;
-                if (!user.identityList) user.identityList = [];
-                if (user.roleList) {
-                    var userRoleName = [];
-                    user.roleList.each(function (role) {
-                        userRoleName.push(role.substring(0, role.indexOf("@")));
-                    });
-                    user.roleList = user.roleList.concat(userRoleName);
-                }
-                var roleLCList = (user.roleList || []).map(function(role){
-                    return role.toLowerCase();
-                }.bind(this));
-                if( roleLCList.isIntersect(["systemmanager","securitymanager","auditmanager"]) ){
-                    window.location = "../x_desktop/app.html?app=ThreeMember";
-                }else{
-                    window.location.reload();
+        o2.Actions.load("x_organization_assemble_authentication").EchoAction.get(function () {
+            if (node) this.loginNode = node;
+            if (!node && this.loginNode) node = this.loginNode;
+            if (layout.config.loginPage && layout.config.loginPage.enable && layout.config.loginPage.portal) {
+                MWF.xDesktop.loadPortal(layout.config.loginPage.portal, this.options.loginParameter);
+                this.fireEvent("openLogin");
+            } else {
+                this.popupOptions = {
+                    "draggable": false,
+                    "closeAction": false,
+                    "hasMask": false,
+                    "relativeToApp": false
+                };
+                this.popupPara = {
+                    container: node
+                };
+                this.postLogin = function (json) {
+                    layout.desktop.session.user = json.data;
+                    layout.session.user = json.data;
+                    layout.session.token = layout.session.user.token;
+                    var user = layout.desktop.session.user;
+                    if (!user.identityList) user.identityList = [];
+                    if (user.roleList) {
+                        var userRoleName = [];
+                        user.roleList.each(function (role) {
+                            userRoleName.push(role.substring(0, role.indexOf("@")));
+                        });
+                        user.roleList = user.roleList.concat(userRoleName);
+                    }
+                    var roleLCList = (user.roleList || []).map(function (role) {
+                        return role.toLowerCase();
+                    }.bind(this));
+                    if (roleLCList.isIntersect(["systemmanager", "securitymanager", "auditmanager"])) {
+                        window.location = "../x_desktop/app.html?app=ThreeMember";
+                    } else {
+                        window.location.reload();
+                    }
+                }.bind(this);
+                this.openLoginForm(this.popupOptions);
+                this.fireEvent("openLogin");
+            }
+        }.bind(this), function (xhr) {
+            var message;
+            if (xhr) {
+                try {
+                    var responseJSON = JSON.parse(xhr.responseText);
+                    message = responseJSON.message; //message为错误提示文本
+                } catch (e) {
                 }
-            }.bind(this);
-            this.openLoginForm(this.popupOptions);
-            this.fireEvent("openLogin");
-        }
+            }
+            if (!message) message = MWF.LP.authentication.accessError;
+            new Element("div", {
+                "style": "font-size:16px;font-weight:bold;",
+                "text": message
+            }).inject(node);
+        }.bind(this));
     },
     safeLogout: function(){
         o2.Actions.get("x_organization_assemble_authentication").safeLogout(function () {

o2web/source/x_component_query_Query/Viewer.js

@@ -2786,13 +2786,13 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
                     var actionNode = new Element("div", {
                         "id": tool.id,
                         "MWFnodetype": tool.type,
-                        "MWFButtonImage": path+""+this.form.options.style+"/custom/"+iconPath+tool.img,
+                        "MWFButtonImage": path+""+this.options.style+"/custom/"+iconPath+tool.img,
                         "title": tool.title,
                         "MWFButtonAction": "runCustomAction",
                         "MWFButtonText": tool.text
                     }).inject(node);
                     if( this.json.customIconOverStyle ){
-                        actionNode.set("MWFButtonImageOver" , path+""+this.form.options.style +"/custom/"+this.json.customIconOverStyle+ "/" +tool.img );
+                        actionNode.set("MWFButtonImageOver" , path+""+this.options.style +"/custom/"+this.json.customIconOverStyle+ "/" +tool.img );
                     }
                     if( tool.properties ){
                         actionNode.set(tool.properties);