Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
483edb73
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
483edb73
编写于
7月 08, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复会议室没有设置的设备的时候,列式会议室可能出错的问题
上级
606dbb0f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
3 deletion
+3
-3
o2web/source/x_component_Meeting/Common.js
o2web/source/x_component_Meeting/Common.js
+2
-2
o2web/source/x_component_Meeting/RoomView.js
o2web/source/x_component_Meeting/RoomView.js
+1
-1
未找到文件。
o2web/source/x_component_Meeting/Common.js
浏览文件 @
483edb73
...
@@ -568,7 +568,7 @@ MWF.xApplication.Meeting.RoomTooltip = new Class({
...
@@ -568,7 +568,7 @@ MWF.xApplication.Meeting.RoomTooltip = new Class({
var
titleStyle
=
"
font-size:14px;color:#333
"
;
var
titleStyle
=
"
font-size:14px;color:#333
"
;
var
valueStyle
=
"
font-size:14px;color:#666;padding-right:20px
"
;
var
valueStyle
=
"
font-size:14px;color:#666;padding-right:20px
"
;
var
device
=
[];
var
device
=
[];
data
.
device
.
split
(
"
#
"
).
each
(
function
(
d
){
(
data
.
device
||
""
)
.
split
(
"
#
"
).
each
(
function
(
d
){
device
.
push
(
lp
[
d
]
);
device
.
push
(
lp
[
d
]
);
}.
bind
(
this
));
}.
bind
(
this
));
...
@@ -1060,7 +1060,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
...
@@ -1060,7 +1060,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
var
iconsNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
roomTitleIconsNode
}).
inject
(
inforNode
);
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
){
deviceList
.
each
(
function
(
name
){
if
(
name
){
if
(
name
){
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
roomTitleIconNode
,
"
title
"
:
this
.
lp
.
device
[
name
]}).
inject
(
iconsNode
);
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
roomTitleIconNode
,
"
title
"
:
this
.
lp
.
device
[
name
]}).
inject
(
iconsNode
);
...
...
o2web/source/x_component_Meeting/RoomView.js
浏览文件 @
483edb73
...
@@ -485,7 +485,7 @@ MWF.xApplication.Meeting.RoomView.Room = new Class({
...
@@ -485,7 +485,7 @@ MWF.xApplication.Meeting.RoomView.Room = new Class({
"
styles
"
:
this
.
css
.
roomItemTitleIconsNode
"
styles
"
:
this
.
css
.
roomItemTitleIconsNode
}).
inject
(
this
.
middleNode
);
}).
inject
(
this
.
middleNode
);
var
deviceList
=
this
.
data
.
device
.
split
(
"
#
"
);
var
deviceList
=
(
this
.
data
.
device
||
""
)
.
split
(
"
#
"
);
deviceList
.
each
(
function
(
name
){
deviceList
.
each
(
function
(
name
){
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
roomItemIconNode
,
"
title
"
:
this
.
app
.
lp
.
device
[
name
]}).
inject
(
this
.
iconsNode
);
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)
"
);
node
.
setStyle
(
"
background-image
"
,
"
url(../x_component_Meeting/$RoomView/default/icon/device/
"
+
name
+
(
this
.
enable
?
""
:
"
_disable
"
)
+
"
.png)
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录