Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
张桐
/
xdykt-build
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
张桐
2017-03-06 19:07:39 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
01b21204248af5cbc81e3a11b75575f335c0ac12
01b21204
1 parent
79567bc9
根据当前课堂的状态,进行修改课堂界面
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
65 行增加
和
15 行删除
css/main.css
index.html
js/draw.js
js/index.js
src/main.js
css/main.css
查看文件 @
01b2120
...
...
@@ -1307,8 +1307,8 @@ height: 1080px;
.curStuUserName
{
position
:
absolute
;
left
:
47px
;
bottom
:
5px
;
left
:
68px
;
bottom
:
40px
;
width
:
auto
;
height
:
16px
;
color
:
#333333
;
...
...
index.html
查看文件 @
01b2120
...
...
@@ -263,13 +263,13 @@
<li
id=
"li-Color1"
class=
"Color1"
title=
"#b8242a"
value=
"#b8242a"
onclick=
"choose(1)"
></li>
<!--蓝色-->
<li
id=
"li-Color2"
class=
"Color2"
title=
"#0071bc"
value=
"#0071bc"
<li
id=
"li-Color2"
class=
"Color2"
title=
"#0071bc"
value=
"#0071bc"
onclick=
"choose(2)"
></li>
<!--紫色-->
<li
id=
"li-Color3"
class=
"Color3"
title=
"#6a0db2"
value=
"#6a0db2"
onclick=
"choose(3)"
></li>
<!--黄色-->
<li
id=
"li-Color4"
class=
"Color4"
title=
"#
fae81b"
value=
"#fae81b"
<li
id=
"li-Color4"
class=
"Color4"
title=
"
fae81b"
value=
"#fae81b"
onclick=
"choose(4)"
></li>
...
...
js/draw.js
查看文件 @
01b2120
...
...
@@ -472,6 +472,7 @@ var color = '#b8242a';
}
window
.
draw
=
{
initCanvas
:
initCanvas
,
draw_graph
:
draw_graph
,
...
...
js/index.js
查看文件 @
01b2120
...
...
@@ -46,7 +46,8 @@ $(function (){
});
$
(
".clearContext"
).
on
(
"click"
,
function
()
{
draw
.
clearContext
(
'1'
);
client
.
sendDeleteAllAnnotation
();
// draw.clearContext('1');
});
...
...
src/main.js
查看文件 @
01b2120
...
...
@@ -21,6 +21,9 @@ var fileItemIdx;
var
classErrorCode
;
//画布
var
canvas
;
var
context
;
...
...
@@ -930,16 +933,6 @@ function showParmasInput(){
function
classJoinSuccess
(
callbackData
){
classAllInfo
=
callbackData
;
console
.
log
(
"classJoinSuccess====>"
,
callbackData
);
//去掉复制功能
document
.
body
.
onselectstart
=
document
.
body
.
oncontextmenu
=
function
(){
return
false
;}
...
...
@@ -976,6 +969,20 @@ function layoutView( ) {
"display"
:
"block"
});
// if(_type==1){
// //主页面显示
// $(".box").css({
...
...
@@ -1092,6 +1099,35 @@ function layoutView( ) {
$
(
"#classCurId"
).
html
(
classAllInfo
.
nodeId
);
}
function
choose
(
agrs
)
{
switch
(
agrs
)
{
case
1
:
chooseColor
.
style
.
background
=
'url("images/color6-n.png") no-repeat'
;
var
colorValue1
=
$
(
".Color1"
).
attr
(
'value'
);
$
(
"#chooseColor"
).
attr
(
'value'
,
colorValue1
);
break
;
case
2
:
chooseColor
.
style
.
background
=
'url("images/color2-n.png") no-repeat'
;
var
colorValue2
=
$
(
".Color2"
).
attr
(
'value'
);
$
(
"#chooseColor"
).
attr
(
'value'
,
colorValue2
);
break
;
case
3
:
chooseColor
.
style
.
background
=
'url("images/color3-n.png") no-repeat'
;
var
colorValue3
=
$
(
".Color3"
).
attr
(
'value'
);
$
(
"#chooseColor"
).
attr
(
'value'
,
colorValue3
);
break
;
case
4
:
chooseColor
.
style
.
background
=
'url("images/color4-n.png") no-repeat'
;
var
colorValue4
=
$
(
".Color4"
).
attr
(
'value'
);
$
(
"#chooseColor"
).
attr
(
'value'
,
colorValue4
);
break
;
default
:
break
;
}
}
function
whiteboardUpdate
(
callbackData
)
{
console
.
log
(
"同步canvas消息"
);
console
.
log
(
callbackData
);
...
...
@@ -1133,6 +1169,12 @@ function classUpdateStatus(callbackData) {
});
}
else
if
(
callbackData
.
classStatus
==
1
){
$
(
".span-classes"
).
html
(
""
);
$
(
"#class-now"
).
html
(
"直播中"
);
$
(
".am-dropdown-content-li-pause"
).
css
(
"display"
,
"block"
);
$
(
".am-dropdown-content-li-begin"
).
css
(
"display"
,
"none"
);
//暂停课堂
$
(
"#classes-status-pause"
).
click
(
function
()
{
$
(
".span-classes"
).
html
(
""
);
...
...
@@ -1157,6 +1199,12 @@ function classUpdateStatus(callbackData) {
}
else
if
(
callbackData
.
classStatus
==
2
){
$
(
".span-classes"
).
html
(
""
);
$
(
"#class-now"
).
html
(
"休息中"
);
$
(
".am-dropdown-content-li-begin"
).
css
(
"display"
,
"none"
);
$
(
".am-dropdown-content-li-rest"
).
css
(
"display"
,
"block"
);
//继续上课
$
(
"#classes-status-rest"
).
click
(
function
()
{
client
.
sendStartClass
();
...
...
请
注册
或
登录
后发表评论