Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
study
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Damon
study
Commits
333cdde1
Commit
333cdde1
authored
Jul 27, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of
https://git.banshouhui.com/wuzhenzhe/study
into dev-v1.0.0
parents
628bed24
c563b06d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
86 deletions
+57
-86
detail.vue
src/pages/cert/detail.vue
+43
-76
detailLearn.vue
src/pages/cert/detailLearn.vue
+14
-10
No files found.
src/pages/cert/detail.vue
View file @
333cdde1
...
@@ -17,8 +17,12 @@
...
@@ -17,8 +17,12 @@
<view
v-if=
"type == 'country'"
class=
"item"
>
<view
v-if=
"type == 'country'"
class=
"item"
>
<view
class=
"name"
>
{{
certName
}}
</view>
<view
class=
"name"
>
{{
certName
}}
</view>
<view
class=
"table"
>
<view
class=
"table"
>
<u-table>
<u-table
border-color=
"#9EA5BB"
>
<u-tr
v-for=
"(item, i) in data.certificateTextContent"
:key=
"i"
class=
"u-tr"
>
<u-tr
v-for=
"(item, i) in data.certificateTextContent"
:key=
"i"
class=
"u-tr"
>
<u-td
<u-td
v-for=
"(val, name, index) in item"
v-for=
"(val, name, index) in item"
:key=
"index"
:key=
"index"
...
@@ -30,60 +34,10 @@
...
@@ -30,60 +34,10 @@
</u-table>
</u-table>
</view>
</view>
</view>
</view>
<view
v-if=
"type == 'learn'"
class=
"item"
style=
"margin-top: 30rpx;"
>
<view
class=
"table"
>
<u-table
border-color=
"#9EA5BB"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
姓名
</u-td>
<u-td
class=
"u-td"
>
{{
name
}}
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
身份证号
</u-td>
<u-td
class=
"u-td"
>
{{
idCard
}}
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
工作单位
</u-td>
<u-td
class=
"u-td"
>
{{
company
}}
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
资格类型
</u-td>
<u-td
class=
"u-td"
>
{{
subjectName
}}
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
培训机构
</u-td>
<u-td
class=
"u-td"
>
{{
institutionName
}}
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
培训日期
</u-td>
<u-td
class=
"u-td"
>
{{
learnDate
}}
</u-td>
</u-tr>
</u-table>
</view>
<view
class=
"table"
style=
"margin-top: 30rpx;"
>
<u-table
class=
"table"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td"
>
培训方式
</u-td>
<u-td
class=
"u-td"
>
最高分
</u-td></u-td>
<u-td
class=
"u-td"
>
实修学时
</u-td>
<u-td
class=
"u-td"
>
测试成绩
</u-td>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td"
>
在线培训
</u-td>
<u-td
class=
"u-td"
>
{{
maxpoint
}}
</u-td>
<u-td
class=
"u-td"
>
{{
learnTime
}}
</u-td>
<u-td
class=
"u-td"
>
{{
resultForTest
}}
</u-td>
</u-tr>
</u-table>
</view>
<view
class=
"cert-foot"
>
<text
class=
"cert-top"
>
{{
institutionName
}}
</text>
<text
class=
"cert-bottom"
>
{{
startDate
}}
</text>
</view>
</view>
</view>
</view>
<view
class=
"foot"
>
<view
class=
"foot"
>
<text>
证书机构:中华人民共和国应急管理部
</text>
<text>
证书机构:中华人民共和国应急管理部
</text>
<text
style=
"padding-top: 28rpx;"
>
更新时间:
{{
nowDate
}}
</text>
<text
style=
"padding-top: 28rpx;"
>
更新时间:
{{
nowDate
}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -107,41 +61,47 @@ export default {
...
@@ -107,41 +61,47 @@ export default {
this
.
formatDataByType
()
this
.
formatDataByType
()
},
},
computed
:
{
computed
:
{
nowDate
(){
nowDate
()
{
var
Today
=
new
Date
();
var
Today
=
new
Date
()
let
m
=
(
Today
.
getMonth
()
+
1
)
let
m
=
Today
.
getMonth
()
+
1
let
d
=
Today
.
getDate
()
let
d
=
Today
.
getDate
()
return
(
Today
.
getFullYear
()
+
'.'
+
(
String
(
m
).
length
>
1
?
m
:
'0'
+
m
)
+
'.'
+
(
String
(
d
).
length
>
1
?
d
:
'0'
+
d
))
return
(
},
Today
.
getFullYear
()
+
startDate
(){
'.'
+
(
String
(
m
).
length
>
1
?
m
:
'0'
+
m
)
+
'.'
+
(
String
(
d
).
length
>
1
?
d
:
'0'
+
d
)
)
},
startDate
()
{
return
this
.
learnData
.
startDate
||
' '
return
this
.
learnData
.
startDate
||
' '
},
},
learnDate
(){
learnDate
()
{
return
this
.
learnData
.
startDate
+
'~'
+
this
.
learnData
.
endDate
return
this
.
learnData
.
startDate
+
'~'
+
this
.
learnData
.
endDate
},
},
name
(){
name
()
{
return
this
.
learnData
.
name
||
' '
return
this
.
learnData
.
name
||
' '
},
},
idCard
(){
idCard
()
{
return
this
.
learnData
.
idCard
||
' '
return
this
.
learnData
.
idCard
||
' '
},
},
company
(){
company
()
{
return
this
.
learnData
.
company
||
' '
return
this
.
learnData
.
company
||
' '
},
},
subjectName
(){
subjectName
()
{
return
this
.
learnData
.
subjectName
||
' '
return
this
.
learnData
.
subjectName
||
' '
},
},
institutionName
(){
institutionName
()
{
return
this
.
learnData
.
institutionName
||
' '
return
this
.
learnData
.
institutionName
||
' '
},
},
maxpoint
(){
maxpoint
()
{
return
this
.
learnData
.
maxPoint
||
0
return
this
.
learnData
.
maxPoint
||
0
},
},
learnTime
(){
learnTime
()
{
return
this
.
learnData
.
time
||
0
return
this
.
learnData
.
time
||
0
},
},
resultForTest
(){
resultForTest
()
{
return
this
.
learnData
.
maxPoint
>
80
&&
'合格'
||
'不合格'
return
(
this
.
learnData
.
maxPoint
>
80
&&
'合格'
)
||
'不合格'
},
},
},
},
methods
:
{
methods
:
{
...
@@ -160,10 +120,12 @@ export default {
...
@@ -160,10 +120,12 @@ export default {
let
count
=
certData
.
data
.
count
||
2
let
count
=
certData
.
data
.
count
||
2
let
list
let
list
console
.
log
(
'data is'
,
certData
.
data
)
console
.
log
(
'data is'
,
certData
.
data
)
if
(
!
certData
.
data
.
certificateTextContent
){
if
(
!
certData
.
data
.
certificateTextContent
)
{
list
=
JSON
.
parse
(
JSON
.
parse
(
JSON
.
stringify
(
certData
.
data
.
certificateContent
)))
list
=
JSON
.
parse
(
JSON
.
parse
(
JSON
.
stringify
(
certData
.
data
.
certificateContent
))
)
console
.
log
(
'list is'
,
list
)
console
.
log
(
'list is'
,
list
)
}
else
{
}
else
{
list
=
certData
.
data
.
certificateTextContent
list
=
certData
.
data
.
certificateTextContent
}
}
...
@@ -231,15 +193,20 @@ export default {
...
@@ -231,15 +193,20 @@ export default {
font-size
:
28rpx
;
font-size
:
28rpx
;
text-align
:
left
;
text-align
:
left
;
padding
:
30rpx
0
;
padding
:
30rpx
0
;
color
:
#191
C
27
;
color
:
#191
c
27
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.table
{
.table
{
/* background-color: #2953ff; */
/* background-color: #2953ff; */
min-height
:
200rpx
;
min-height
:
200rpx
;
::v-deep
.bg-td
:nth-of-type
(
2n
+
1
)
{
::v-deep
.u-td
{
background-color
:
#E8EBF3
!
important
;
font-weight
:
bold
;
color
:
#5a6073
;
}
::v-deep
.bg-td
:nth-of-type
(
2n
+
1
)
{
background-color
:
#e8ebf3
!
important
;
font-weight
:
bold
!
important
;
font-weight
:
bold
!
important
;
color
:
#191c27
;
}
}
}
}
}
}
...
@@ -256,7 +223,7 @@ export default {
...
@@ -256,7 +223,7 @@ export default {
font-size
:
28rpx
;
font-size
:
28rpx
;
color
:
#5a6073
;
color
:
#5a6073
;
}
}
.cert-foot
{
.cert-foot
{
height
:
100rpx
;
height
:
100rpx
;
width
:
100%
;
width
:
100%
;
text-align
:
right
;
text-align
:
right
;
...
...
src/pages/cert/detailLearn.vue
View file @
333cdde1
...
@@ -21,27 +21,27 @@
...
@@ -21,27 +21,27 @@
<u-table
border-color=
"#9EA5BB"
>
<u-table
border-color=
"#9EA5BB"
>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
姓名
</u-td>
<u-td
class=
"u-td bg-td"
>
姓名
</u-td>
<u-td
class=
"u-td"
>
{{
name
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
name
}}
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
身份证号
</u-td></u-td>
<u-td
class=
"u-td bg-td"
>
身份证号
</u-td></u-td>
<u-td
class=
"u-td"
>
{{
idCard
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
idCard
}}
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
工作单位
</u-td>
<u-td
class=
"u-td bg-td"
>
工作单位
</u-td>
<u-td
class=
"u-td"
>
{{
company
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
company
}}
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
资格类型
</u-td>
<u-td
class=
"u-td bg-td"
>
资格类型
</u-td>
<u-td
class=
"u-td"
>
{{
subjectName
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
subjectName
}}
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
培训机构
</u-td>
<u-td
class=
"u-td bg-td"
>
培训机构
</u-td>
<u-td
class=
"u-td"
>
{{
institutionName
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
institutionName
}}
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td bg-td"
>
培训日期
</u-td>
<u-td
class=
"u-td bg-td"
>
培训日期
</u-td>
<u-td
class=
"u-td"
>
{{
learnDate
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
learnDate
}}
</u-td>
</u-tr>
</u-tr>
</u-table>
</u-table>
</view>
</view>
...
@@ -54,10 +54,10 @@
...
@@ -54,10 +54,10 @@
<u-td
class=
"u-td bg-td"
>
测试成绩
</u-td>
<u-td
class=
"u-td bg-td"
>
测试成绩
</u-td>
</u-tr>
</u-tr>
<u-tr
class=
"u-tr"
>
<u-tr
class=
"u-tr"
>
<u-td
class=
"u-td"
>
在线培训
</u-td>
<u-td
class=
"u-td
val-td
"
>
在线培训
</u-td>
<u-td
class=
"u-td"
>
{{
maxpoint
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
maxpoint
}}
</u-td>
<u-td
class=
"u-td"
>
{{
learnTime
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
learnTime
}}
</u-td>
<u-td
class=
"u-td"
>
{{
resultForTest
}}
</u-td>
<u-td
class=
"u-td
val-td
"
>
{{
resultForTest
}}
</u-td>
</u-tr>
</u-tr>
</u-table>
</u-table>
</view>
</view>
...
@@ -235,6 +235,10 @@ export default {
...
@@ -235,6 +235,10 @@ export default {
.
u-tr
:
:
v-deep
.
u-td
{
.
u-tr
:
:
v-deep
.
u-td
{
font-size
:
22rpx
!
important
;
font-size
:
22rpx
!
important
;
}
}
.
u-tr
:
:
v-deep
.
val-td
{
font-weight
:
bold
;
color
:
#5A6073
!
important
;
}
}
}
.foot
{
.foot
{
height
:
100rpx
;
height
:
100rpx
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment