Просмотр исходного кода

Merge branch 'fix/Meeting.device_execption' into 'develop'

Merge of fix/【会议管理】修复会议室没有设置的设备的时候,列式会议室可能出错的问题 to develop

See merge request o2oa/o2oa!1068
蔡祥熠 5 лет назад
Родитель
Сommit
054ffc46ae

+ 2 - 2
o2web/source/x_component_Meeting/Common.js

@@ -568,7 +568,7 @@ MWF.xApplication.Meeting.RoomTooltip = new Class({
         var titleStyle = "font-size:14px;color:#333";
         var valueStyle = "font-size:14px;color:#666;padding-right:20px";
         var device = [];
-        data.device.split("#").each( function( d ){
+        ( data.device || "" ).split("#").each( function( d ){
             device.push( lp[d] );
         }.bind(this));
 
@@ -1060,7 +1060,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
 
         var iconsNode = new Element("div", {"styles": this.css.roomTitleIconsNode}).inject(inforNode);
 
-        var deviceList = room.device.split("#");
+        var deviceList = ( room.device || "" ).split("#");
         deviceList.each(function(name){
             if( name ){
                 var node = new Element("div", {"styles": this.css.roomTitleIconNode, "title": this.lp.device[name]}).inject(iconsNode);

+ 1 - 1
o2web/source/x_component_Meeting/RoomView.js

@@ -485,7 +485,7 @@ MWF.xApplication.Meeting.RoomView.Room = new Class({
             "styles": this.css.roomItemTitleIconsNode
         }).inject(this.middleNode);
 
-        var deviceList = this.data.device.split("#");
+        var deviceList = ( this.data.device || "" ).split("#");
         deviceList.each(function(name){
             var node = new Element("div", {"styles": this.css.roomItemIconNode, "title": this.app.lp.device[name]}).inject(this.iconsNode);
             node.setStyle("background-image", "url(../x_component_Meeting/$RoomView/default/icon/device/"+  name + ( this.enable ? "" : "_disable" ) +".png)");