Commit 333cdde1 authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

parents 628bed24 c563b06d
......@@ -17,8 +17,12 @@
<view v-if="type == 'country'" class="item">
<view class="name">{{ certName }}</view>
<view class="table">
<u-table>
<u-tr v-for="(item, i) in data.certificateTextContent" :key="i" class="u-tr">
<u-table border-color="#9EA5BB">
<u-tr
v-for="(item, i) in data.certificateTextContent"
:key="i"
class="u-tr"
>
<u-td
v-for="(val, name, index) in item"
:key="index"
......@@ -30,60 +34,10 @@
</u-table>
</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 class="foot">
<text>证书机构:中华人民共和国应急管理部</text>
<text style="padding-top: 28rpx;">更新时间:{{nowDate}}</text>
<text style="padding-top: 28rpx;">更新时间:{{ nowDate }}</text>
</view>
</view>
</view>
......@@ -107,41 +61,47 @@ export default {
this.formatDataByType()
},
computed: {
nowDate(){
var Today=new Date();
let m = (Today.getMonth()+1)
nowDate() {
var Today = new Date()
let m = Today.getMonth() + 1
let d = Today.getDate()
return (Today.getFullYear() + '.' + (String(m).length > 1 ? m : '0' + m) + '.' + (String(d).length > 1 ? d : '0' + d))
return (
Today.getFullYear() +
'.' +
(String(m).length > 1 ? m : '0' + m) +
'.' +
(String(d).length > 1 ? d : '0' + d)
)
},
startDate(){
startDate() {
return this.learnData.startDate || ' '
},
learnDate(){
learnDate() {
return this.learnData.startDate + '~' + this.learnData.endDate
},
name(){
name() {
return this.learnData.name || ' '
},
idCard(){
idCard() {
return this.learnData.idCard || ' '
},
company(){
company() {
return this.learnData.company || ' '
},
subjectName(){
subjectName() {
return this.learnData.subjectName || ' '
},
institutionName(){
institutionName() {
return this.learnData.institutionName || ' '
},
maxpoint(){
maxpoint() {
return this.learnData.maxPoint || 0
},
learnTime(){
learnTime() {
return this.learnData.time || 0
},
resultForTest(){
return this.learnData.maxPoint > 80 && '合格' || '不合格'
resultForTest() {
return (this.learnData.maxPoint > 80 && '合格') || '不合格'
},
},
methods: {
......@@ -160,13 +120,15 @@ export default {
let count = certData.data.count || 2
let list
console.log('data is', certData.data)
if(!certData.data.certificateTextContent){
list = JSON.parse(JSON.parse(JSON.stringify(certData.data.certificateContent)))
if (!certData.data.certificateTextContent) {
list = JSON.parse(
JSON.parse(JSON.stringify(certData.data.certificateContent))
)
console.log('list is', list)
}else{
} else {
list = certData.data.certificateTextContent
}
for (let key in list) {
countryData[key] = []
for (let i = 1; i <= count; i++) {
......@@ -231,15 +193,20 @@ export default {
font-size: 28rpx;
text-align: left;
padding: 30rpx 0;
color: #191C27;
color: #191c27;
font-weight: bold;
}
.table {
/* background-color: #2953ff; */
min-height: 200rpx;
::v-deep .bg-td:nth-of-type(2n+1){
background-color: #E8EBF3 !important;
::v-deep .u-td {
font-weight: bold;
color: #5a6073;
}
::v-deep .bg-td:nth-of-type(2n + 1) {
background-color: #e8ebf3 !important;
font-weight: bold !important;
color: #191c27;
}
}
}
......@@ -256,7 +223,7 @@ export default {
font-size: 28rpx;
color: #5a6073;
}
.cert-foot{
.cert-foot {
height: 100rpx;
width: 100%;
text-align: right;
......
......@@ -21,27 +21,27 @@
<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-td class="u-td val-td">{{name}}</u-td>
</u-tr>
<u-tr class="u-tr">
<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 class="u-tr">
<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 class="u-tr">
<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 class="u-tr">
<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 class="u-tr">
<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-table>
</view>
......@@ -54,10 +54,10 @@
<u-td class="u-td bg-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-td class="u-td val-td">在线培训</u-td>
<u-td class="u-td val-td">{{maxpoint}}</u-td>
<u-td class="u-td val-td">{{learnTime}}</u-td>
<u-td class="u-td val-td">{{resultForTest}}</u-td>
</u-tr>
</u-table>
</view>
......@@ -235,6 +235,10 @@ export default {
.u-tr ::v-deep .u-td {
font-size: 22rpx !important;
}
.u-tr ::v-deep .val-td {
font-weight: bold;
color: #5A6073 !important;
}
}
.foot {
height: 100rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment