Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-professional-exam
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-professional-exam
提交
de211d50
提交
de211d50
编写于
1月 09, 2020
作者:
huangwensu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
样式和埋点修改
上级
a9f236e1
变更
8
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
97 行增加
和
54 行删除
+97
-54
cme-step.vue
src/components/cme/cme-step.vue
+19
-19
item-intro.vue
src/components/cme/item-intro.vue
+1
-1
item-leader.vue
src/components/cme/item-leader.vue
+32
-12
teacter-intro.vue
src/components/cme/teacter-intro.vue
+31
-11
status-end-cme.png
src/images/status-end-cme.png
+0
-0
env-config.js
src/utils/env-config.js
+1
-1
credit-detail.vue
src/views/credit-detail.vue
+4
-1
merge-detail.vue
src/views/merge-detail.vue
+9
-9
未找到文件。
src/components/cme/cme-step.vue
浏览文件 @
de211d50
...
@@ -290,12 +290,12 @@ export default {
...
@@ -290,12 +290,12 @@ export default {
content
:
""
;
content
:
""
;
width
:
px2rem
(
0px
);
width
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
border-top
:
px2rem
(
5
px
)
solid
#449284
;
border-top
:
px2rem
(
7
px
)
solid
#449284
;
border-left
:
px2rem
(
5
px
)
solid
transparent
;
border-left
:
px2rem
(
7
px
)
solid
transparent
;
border-right
:
px2rem
(
5
px
)
solid
transparent
;
border-right
:
px2rem
(
7
px
)
solid
transparent
;
position
:
absolute
;
position
:
absolute
;
top
:
px2rem
(
20
px
);
top
:
px2rem
(
18
px
);
left
:
px2rem
(
2
2
px
);
left
:
px2rem
(
2
1
px
);
}
}
.step2-text
{
.step2-text
{
left
:
px2rem
(
106px
);
left
:
px2rem
(
106px
);
...
@@ -305,12 +305,12 @@ export default {
...
@@ -305,12 +305,12 @@ export default {
content
:
""
;
content
:
""
;
width
:
px2rem
(
0px
);
width
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
border-top
:
px2rem
(
5
px
)
solid
#449284
;
border-top
:
px2rem
(
7
px
)
solid
#449284
;
border-left
:
px2rem
(
5
px
)
solid
transparent
;
border-left
:
px2rem
(
7
px
)
solid
transparent
;
border-right
:
px2rem
(
5
px
)
solid
transparent
;
border-right
:
px2rem
(
7
px
)
solid
transparent
;
position
:
absolute
;
position
:
absolute
;
top
:
px2rem
(
20
px
);
top
:
px2rem
(
18
px
);
left
:
px2rem
(
30
px
);
left
:
px2rem
(
29
px
);
}
}
.step3-text
{
.step3-text
{
left
:
px2rem
(
207px
);
left
:
px2rem
(
207px
);
...
@@ -319,12 +319,12 @@ export default {
...
@@ -319,12 +319,12 @@ export default {
content
:
""
;
content
:
""
;
width
:
px2rem
(
0px
);
width
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
border-top
:
px2rem
(
5
px
)
solid
#449284
;
border-top
:
px2rem
(
7
px
)
solid
#449284
;
border-left
:
px2rem
(
5
px
)
solid
transparent
;
border-left
:
px2rem
(
7
px
)
solid
transparent
;
border-right
:
px2rem
(
5
px
)
solid
transparent
;
border-right
:
px2rem
(
7
px
)
solid
transparent
;
position
:
absolute
;
position
:
absolute
;
top
:
px2rem
(
20
px
);
top
:
px2rem
(
18
px
);
left
:
px2rem
(
2
2
px
);
left
:
px2rem
(
2
1
px
);
}
}
.step4-text
{
.step4-text
{
right
:
px2rem
(
20px
);
right
:
px2rem
(
20px
);
...
@@ -333,11 +333,11 @@ export default {
...
@@ -333,11 +333,11 @@ export default {
content
:
""
;
content
:
""
;
width
:
px2rem
(
0px
);
width
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
height
:
px2rem
(
0px
);
border-top
:
px2rem
(
5
px
)
solid
#449284
;
border-top
:
px2rem
(
7
px
)
solid
#449284
;
border-left
:
px2rem
(
5
px
)
solid
transparent
;
border-left
:
px2rem
(
7
px
)
solid
transparent
;
border-right
:
px2rem
(
5
px
)
solid
transparent
;
border-right
:
px2rem
(
7
px
)
solid
transparent
;
position
:
absolute
;
position
:
absolute
;
top
:
px2rem
(
20
px
);
top
:
px2rem
(
18
px
);
right
:
px2rem
(
20px
);
right
:
px2rem
(
20px
);
}
}
.apply-score-content
{
.apply-score-content
{
...
...
src/components/cme/item-intro.vue
浏览文件 @
de211d50
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<div
class=
"basic-title"
>
项目介绍
</div>
<div
class=
"basic-title"
>
项目介绍
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<div
class=
"text"
>
{{
textContent
}}
</div>
<div
class=
"text"
>
{{
textContent
}}
</div>
<div
v-if=
"textContent.length > 7
6
"
class=
"desc"
@
click=
"allText"
>
<div
v-if=
"textContent.length > 7
0
"
class=
"desc"
@
click=
"allText"
>
<span>
{{
btnText
}}
</span>
<span>
{{
btnText
}}
</span>
<img
v-if=
"!allTextFlag"
src=
"../../images/down.png"
/>
<img
v-if=
"!allTextFlag"
src=
"../../images/down.png"
/>
<img
v-if=
"allTextFlag"
src=
"../../images/up.png"
/>
<img
v-if=
"allTextFlag"
src=
"../../images/up.png"
/>
...
...
src/components/cme/item-leader.vue
浏览文件 @
de211d50
...
@@ -4,14 +4,16 @@
...
@@ -4,14 +4,16 @@
<div
class=
"leader-info"
>
<div
class=
"leader-info"
>
<img
:src=
"projectLeader.appImageUrl"
/>
<img
:src=
"projectLeader.appImageUrl"
/>
<div
class=
"leader-text"
>
<div
class=
"leader-text"
>
<div
class=
"leader-con"
>
<span>
{{
projectLeader
.
name
}}
</span>
<span>
{{
projectLeader
.
name
}}
</span>
<span>
{{
projectLeader
.
title
}}
</span>
<span
class=
"leader-title"
>
{{
projectLeader
.
title
}}
</span>
</div>
<div
class=
"address"
>
{{
projectLeader
.
hospital
}}
</div>
<div
class=
"address"
>
{{
projectLeader
.
hospital
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<div
class=
"text"
>
{{
leaderText
}}
</div>
<div
class=
"text"
>
{{
leaderText
}}
</div>
<div
v-if=
"leaderText.length > 7
6
"
class=
"desc"
@
click=
"allText"
>
<div
v-if=
"leaderText.length > 7
0
"
class=
"desc"
@
click=
"allText"
>
<span>
{{
btnText
}}
</span>
<span>
{{
btnText
}}
</span>
<img
v-if=
"!allTextFlag"
src=
"../../images/down.png"
/>
<img
v-if=
"!allTextFlag"
src=
"../../images/down.png"
/>
<img
v-if=
"allTextFlag"
src=
"../../images/up.png"
/>
<img
v-if=
"allTextFlag"
src=
"../../images/up.png"
/>
...
@@ -75,20 +77,38 @@ export default {
...
@@ -75,20 +77,38 @@ export default {
}
}
.leader-text
{
.leader-text
{
margin-left
:
px2rem
(
16px
);
margin-left
:
px2rem
(
16px
);
margin-top
:
px2rem
(
6px
);
.leader-con
{
line-height
:
px2rem
(
14px
);
line-height
:
px2rem
(
14px
);
overflow
:
hidden
;
span
{
span
{
font-size
:
px2rem
(
16px
);
font-size
:
px2rem
(
16px
);
color
:
#676869
;
color
:
#676869
;
}
}
span
:first-child
{
span
:first-child
{
float
:
left
;
font-size
:
px2rem
(
16px
);
font-size
:
px2rem
(
16px
);
color
:
#373839
;
color
:
#373839
;
font-weight
:
700
;
font-weight
:
700
;
}
}
.leader-title
{
float
:
left
;
width
:
px2rem
(
220px
);
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:nowrap
;
line-height
:
px2rem
(
16px
);
margin-left
:
px2rem
(
10px
);
}
}
.address
{
.address
{
margin-top
:
px2rem
(
5px
);
margin-top
:
px2rem
(
5px
);
font-size
:
px2rem
(
13px
);
font-size
:
px2rem
(
13px
);
color
:
#979899
;
color
:
#979899
;
width
:
px2rem
(
240px
);
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:nowrap
;
}
}
}
}
}
}
...
...
src/components/cme/teacter-intro.vue
浏览文件 @
de211d50
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
<div
class=
"leader-info"
v-for=
"(item,index) in doctorList"
:key=
"index"
>
<div
class=
"leader-info"
v-for=
"(item,index) in doctorList"
:key=
"index"
>
<img
:src=
"item.appImageUrl"
/>
<img
:src=
"item.appImageUrl"
/>
<div
class=
"leader-text"
>
<div
class=
"leader-text"
>
<div
class=
"leader-con"
>
<span>
{{
item
.
name
}}
</span>
<span>
{{
item
.
name
}}
</span>
<span>
{{
item
.
title
}}
</span>
<span
class=
"leader-title"
>
{{
item
.
title
}}
</span>
</div>
<div
class=
"address"
>
{{
item
.
hospital
}}
</div>
<div
class=
"address"
>
{{
item
.
hospital
}}
</div>
</div>
</div>
</div>
</div>
...
@@ -58,20 +60,38 @@ export default {
...
@@ -58,20 +60,38 @@ export default {
}
}
.leader-text
{
.leader-text
{
margin-left
:
px2rem
(
16px
);
margin-left
:
px2rem
(
16px
);
line-height
:
px2rem
(
16px
);
margin-top
:
px2rem
(
6px
);
.leader-con
{
line-height
:
px2rem
(
14px
);
overflow
:
hidden
;
span
{
span
{
font-size
:
px2rem
(
16px
);
font-size
:
px2rem
(
16px
);
color
:
#676869
;
color
:
#676869
;
}
}
span
:first-child
{
span
:first-child
{
float
:
left
;
font-size
:
px2rem
(
16px
);
font-size
:
px2rem
(
16px
);
color
:
#373839
;
color
:
#373839
;
font-weight
:
700
;
font-weight
:
700
;
}
}
.leader-title
{
float
:
left
;
width
:
px2rem
(
220px
);
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:nowrap
;
line-height
:
px2rem
(
16px
);
margin-left
:
px2rem
(
10px
);
}
}
.address
{
.address
{
margin-top
:
px2rem
(
5px
);
margin-top
:
px2rem
(
5px
);
font-size
:
px2rem
(
13px
);
font-size
:
px2rem
(
13px
);
color
:
#979899
;
color
:
#979899
;
width
:
px2rem
(
240px
);
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:nowrap
;
}
}
}
}
}
}
...
...
src/images/status-end-cme.png
0 → 100644
浏览文件 @
de211d50
3.1 KB
src/utils/env-config.js
浏览文件 @
de211d50
...
@@ -9,7 +9,7 @@ export const envConfig = {
...
@@ -9,7 +9,7 @@ export const envConfig = {
// baseUrl: 'http://192.168.140.14:10201/',
// baseUrl: 'http://192.168.140.14:10201/',
apiUrl
:
'https://dev-api.yunqueyi.com/'
,
apiUrl
:
'https://dev-api.yunqueyi.com/'
,
webPageUrl
:
'https://dev-phome.yunqueyi.com/'
,
webPageUrl
:
'https://dev-phome.yunqueyi.com/'
,
baseUrl
:
'https://
dev
-sc.yunqueyi.com/'
,
baseUrl
:
'https://
test1
-sc.yunqueyi.com/'
,
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
...
...
src/views/credit-detail.vue
浏览文件 @
de211d50
...
@@ -222,10 +222,13 @@ export default {
...
@@ -222,10 +222,13 @@ export default {
// 判断加入机构与学习范围是否一致
// 判断加入机构与学习范围是否一致
// this.permission();
// this.permission();
// alert("去学习");
// alert("去学习");
this
.
$sendBuriedData
({
component_tag
:
`416#212005#${this.creditId
}
#`
}
);
}
else
if
(
this
.
formData
.
status
==
2
)
{
}
else
if
(
this
.
formData
.
status
==
2
)
{
// alert("调用申请学分的接口");
// alert("调用申请学分的接口");
this
.
$sendBuriedData
({
this
.
$sendBuriedData
({
component_tag
:
`
211#211002#${this.projectId
}
#${this.formData.projectName
}
`
component_tag
:
`
416#212004#${this.creditId
}
#
`
}
);
}
);
this
.
applicationCredit
();
this
.
applicationCredit
();
}
else
if
(
this
.
formData
.
status
==
4
)
{
}
else
if
(
this
.
formData
.
status
==
4
)
{
...
...
src/views/merge-detail.vue
浏览文件 @
de211d50
...
@@ -19,9 +19,9 @@
...
@@ -19,9 +19,9 @@
<!-- banner图片 -->
<!-- banner图片 -->
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
<img
class=
"banner-img"
:src=
"attachmentUrl"
/>
<img
class=
"banner-img"
:src=
"attachmentUrl"
/>
<
img
v-show=
"project.status == 1"
class=
"banner-img-1"
src=
"../images/status-join.png"
/
>
<
!--
<img
v-show=
"project.status == 1"
class=
"banner-img-1"
src=
"../images/status-join.png"
/>
--
>
<img
v-show=
"project.status == 5"
class=
"banner-img-5"
src=
"../images/status-keep-on.png"
/>
<img
v-show=
"project.status == 5"
class=
"banner-img-5"
src=
"../images/status-keep-on.png"
/>
<img
v-show=
"project.status == 10"
class=
"banner-img-10"
src=
"../images/status-end.png"
/>
<img
v-show=
"project.status == 10"
class=
"banner-img-10"
src=
"../images/status-end
-cme
.png"
/>
</div>
</div>
<!-- banner视频 -->
<!-- banner视频 -->
<CommonTcPlayer
v-if=
"bannerType == 2"
style=
"flex"
:options=
"videoOptions"
></CommonTcPlayer>
<CommonTcPlayer
v-if=
"bannerType == 2"
style=
"flex"
:options=
"videoOptions"
></CommonTcPlayer>
...
@@ -151,7 +151,7 @@ export default {
...
@@ -151,7 +151,7 @@ export default {
studyNum
:
0
,
// 学习人数
studyNum
:
0
,
// 学习人数
studyProgress
:
"0%"
,
// 学习进度
studyProgress
:
"0%"
,
// 学习进度
subject
:
""
,
// 学科
subject
:
""
,
// 学科
status
:
0
,
// 项目状态
1是参加中
5是进行中 10是已结束
status
:
0
,
// 项目状态 5是进行中 10是已结束
certificateUrl
:
""
,
// 证书url
certificateUrl
:
""
,
// 证书url
inScope
:
0
,
// 是否在范围内判断
inScope
:
0
,
// 是否在范围内判断
projectCredit
:
""
,
// 学分
projectCredit
:
""
,
// 学分
...
@@ -354,7 +354,7 @@ export default {
...
@@ -354,7 +354,7 @@ export default {
if
(
this
.
isWeb
)
{
if
(
this
.
isWeb
)
{
h
=
intro
.
offsetTop
-
title
.
offsetHeight
;
h
=
intro
.
offsetTop
-
title
.
offsetHeight
;
}
else
{
}
else
{
h
=
intro
.
offsetTop
-
50
-
title
.
offsetHeight
;
h
=
intro
.
offsetTop
-
75
-
title
.
offsetHeight
;
}
}
window
.
scrollTo
(
0
,
h
);
window
.
scrollTo
(
0
,
h
);
this
.
isBlack
=
true
;
this
.
isBlack
=
true
;
...
@@ -406,13 +406,13 @@ export default {
...
@@ -406,13 +406,13 @@ export default {
_this
.
project
=
res
.
data
;
_this
.
project
=
res
.
data
;
if
(
_this
.
project
.
projectIntro
)
{
if
(
_this
.
project
.
projectIntro
)
{
_this
.
textContent
=
_this
.
project
.
projectIntro
.
length
>
7
6
?
_this
.
project
.
projectIntro
.
slice
(
0
,
76
)
+
"..."
:
this
.
project
.
projectIntro
;
_this
.
textContent
=
_this
.
project
.
projectIntro
.
length
>
7
0
?
_this
.
project
.
projectIntro
.
slice
(
0
,
70
)
+
"..."
:
this
.
project
.
projectIntro
;
}
}
_this
.
project
.
mustKnow
=
_this
.
project
.
mustKnow
.
replace
(
/
(\r\n)
|
\r
|
\n
/g
,
"<br>"
);
_this
.
project
.
mustKnow
=
_this
.
project
.
mustKnow
.
replace
(
/
(\r\n)
|
\r
|
\n
/g
,
"<br>"
);
_this
.
projectLeader
=
res
.
data
.
projectLeader
||
{};
_this
.
projectLeader
=
res
.
data
.
projectLeader
||
{};
if
(
_this
.
projectLeader
.
info
)
{
if
(
_this
.
projectLeader
.
info
)
{
_this
.
leaderText
=
_this
.
projectLeader
.
info
.
length
>
7
6
?
_this
.
projectLeader
.
info
.
slice
(
0
,
76
)
+
"..."
:
this
.
projectLeader
.
info
;
_this
.
leaderText
=
_this
.
projectLeader
.
info
.
length
>
7
0
?
_this
.
projectLeader
.
info
.
slice
(
0
,
70
)
+
"..."
:
this
.
projectLeader
.
info
;
}
}
_this
.
doctorList
=
res
.
data
.
doctorList
;
_this
.
doctorList
=
res
.
data
.
doctorList
;
...
@@ -434,7 +434,7 @@ export default {
...
@@ -434,7 +434,7 @@ export default {
let
_this
=
this
;
let
_this
=
this
;
if
(
_this
.
projectLeader
.
info
)
{
if
(
_this
.
projectLeader
.
info
)
{
if
(
!
data
.
allTextFlag
)
{
if
(
!
data
.
allTextFlag
)
{
_this
.
leaderText
=
_this
.
projectLeader
.
info
.
length
>
7
6
?
_this
.
projectLeader
.
info
.
slice
(
0
,
76
)
+
"..."
:
this
.
projectLeader
.
info
;
_this
.
leaderText
=
_this
.
projectLeader
.
info
.
length
>
7
0
?
_this
.
projectLeader
.
info
.
slice
(
0
,
70
)
+
"..."
:
this
.
projectLeader
.
info
;
}
else
{
}
else
{
_this
.
leaderText
=
_this
.
projectLeader
.
info
;
_this
.
leaderText
=
_this
.
projectLeader
.
info
;
}
}
...
@@ -445,7 +445,7 @@ export default {
...
@@ -445,7 +445,7 @@ export default {
let
_this
=
this
;
let
_this
=
this
;
if
(
_this
.
project
.
projectIntro
)
{
if
(
_this
.
project
.
projectIntro
)
{
if
(
!
data
.
allTextFlag
)
{
if
(
!
data
.
allTextFlag
)
{
_this
.
textContent
=
_this
.
project
.
projectIntro
.
length
>
7
6
?
_this
.
project
.
projectIntro
.
slice
(
0
,
76
)
+
"..."
:
this
.
project
.
projectIntro
;
_this
.
textContent
=
_this
.
project
.
projectIntro
.
length
>
7
0
?
_this
.
project
.
projectIntro
.
slice
(
0
,
70
)
+
"..."
:
this
.
project
.
projectIntro
;
}
else
{
}
else
{
_this
.
textContent
=
_this
.
project
.
projectIntro
;
_this
.
textContent
=
_this
.
project
.
projectIntro
;
}
}
...
@@ -614,7 +614,7 @@ export default {
...
@@ -614,7 +614,7 @@ export default {
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
top
:
px2rem
(
180px
);
top
:
px2rem
(
180px
);
width
:
px2rem
(
148
px
);
width
:
px2rem
(
76
px
);
height
:
px2rem
(
30px
);
height
:
px2rem
(
30px
);
}
}
}
}
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录