From 2e395c5446a74cf66e72976ad2aae63f0cf38d10 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期二, 16 五月 2023 11:23:33 +0800
Subject: [PATCH] Merge branch 'v13-20230413' into master_merge_V13
---
/dev/null | 0
public/element-uilib.zip | 0
src/views/exam/paper/career_interests.vue | 6 +++---
src/assets/report/page3-1.png | 0
src/assets/report/page5.jpg | 0
src/assets/report/page3-IA.png | 0
src/assets/report/page3.png | 0
src/views/demography/index.vue | 4 +++-
src/views/report/reportH5.vue | 35 ++++++++++++++++++++---------------
src/router.js | 2 +-
src/assets/report/page5.png | 0
11 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/public/element-uilib.zip b/public/element-uilib.zip
new file mode 100644
index 0000000..ba1de22
--- /dev/null
+++ b/public/element-uilib.zip
Binary files differ
diff --git a/src/assets/report/page3-1.png.bak b/src/assets/report/page3-1.png
similarity index 100%
rename from src/assets/report/page3-1.png.bak
rename to src/assets/report/page3-1.png
Binary files differ
diff --git a/src/assets/report/page3-IA.png b/src/assets/report/page3-IA.png
new file mode 100644
index 0000000..0f6f988
--- /dev/null
+++ b/src/assets/report/page3-IA.png
Binary files differ
diff --git a/src/assets/report/page3.png b/src/assets/report/page3.png
index 0f6f988..32d1a41 100644
--- a/src/assets/report/page3.png
+++ b/src/assets/report/page3.png
Binary files differ
diff --git a/src/assets/report/page3.png.bak b/src/assets/report/page3.png.bak
deleted file mode 100644
index 32d1a41..0000000
--- a/src/assets/report/page3.png.bak
+++ /dev/null
Binary files differ
diff --git a/src/assets/report/page5.jpg b/src/assets/report/page5.jpg
new file mode 100644
index 0000000..e77482b
--- /dev/null
+++ b/src/assets/report/page5.jpg
Binary files differ
diff --git a/src/assets/report/page5.png b/src/assets/report/page5.png
index e26f92e..6e61eb3 100644
--- a/src/assets/report/page5.png
+++ b/src/assets/report/page5.png
Binary files differ
diff --git a/src/router.js b/src/router.js
index 93c1dc1..e07934d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -159,7 +159,7 @@
path: '/report/h5',
component: () => import('@/views/report/reportH5'),
name: 'reportH5',
- meta: { title: 'H5鎶ュ憡' }
+ meta: { title: '涓汉鍙嶉鎶ュ憡' }
}
]
})
diff --git a/src/views/demography/index.vue b/src/views/demography/index.vue
index 997ece0..d657711 100644
--- a/src/views/demography/index.vue
+++ b/src/views/demography/index.vue
@@ -132,7 +132,9 @@
_paramsInfo.paramId = _this.demographyMenber.data[i].paramId
_paramsInfo.paramName = _this.demographyMenber.data[i].paramName
_paramsInfo.paramValue = _this.demographyMenber.data[i].paramValue
- if (_paramsInfo.paramValue.trim() === '') {
+ console.log('_paramsInfo.paramValue' + _paramsInfo.paramValue)
+ console.log('_paramsInfo.paramValue' + typeof _paramsInfo.paramValue)
+ if (!_paramsInfo.paramValue) {
continue
}
_this.parasInfos.push(_paramsInfo)
diff --git a/src/views/exam/paper/career_interests.vue b/src/views/exam/paper/career_interests.vue
index f86476b..3ffb732 100644
--- a/src/views/exam/paper/career_interests.vue
+++ b/src/views/exam/paper/career_interests.vue
@@ -1,8 +1,8 @@
<template>
<div>
- <el-container class="app-item-contain">
- <el-header class="align-center" v-if="guide">
- <h1></h1>
+ <el-container class="app-item-contain is-vertical">
+ <el-header class="align-center" v-if="guide" style="height: 50px;padding: 1%;margin-top: 4%">
+ <H2 v-html="$t('guide')"></H2>
</el-header>
<el-main style="padding-top: 3%;">
<div v-html="guideDescirption" v-if="guide" :style="ismobile?'padding-top: 2%;margin-top: 5%;':'padding-top: 2%;margin: 0 auto;width:66%'"></div>
diff --git a/src/views/report/reportH5.vue b/src/views/report/reportH5.vue
index f5f795f..842f495 100644
--- a/src/views/report/reportH5.vue
+++ b/src/views/report/reportH5.vue
@@ -9,18 +9,19 @@
<el-image :src="require('@/assets/report/page2.png')"></el-image>
<div id="myChart" style="width: 100%; height: 300px; "></div>
</div>
-
<div class="report">
<el-image :src="require('@/assets/report/page3.png')"></el-image>
- <div class="word" style="left: 40%;top: 3.3%;font-size: 0.8rem;color: #34BBC4">{{ data.PR_Dim01 }}</div>
- <div class="word" style="left: 40%;top: 6.3%;font-size: 0.8rem;color: #E1AD04">{{ data.PR_Dim02 }}</div>
- <div class="word" style="left: 40%;top: 9.3%;font-size: 0.8rem;color: #6D67AD">{{ data.PR_Dim03 }}</div>
- <div class="word" style="left: 40%;top: 12.3%;font-size: 0.8rem;color: #EC7864">{{ data.PR_Dim04 }}</div>
- <div class="word" style="left: 80%;top: 3.3%;font-size: 0.8rem;color: #D78EBB">{{ data.PR_Dim05 }}</div>
- <div class="word" style="left: 80%;top: 6.3%;font-size: 0.8rem;color: #E8497D">{{ data.PR_Dim06 }}</div>
- <div class="word" style="left: 80%;top: 9.3%;font-size: 0.8rem;color: #62BEA4">{{ data.PR_Dim07 }}</div>
- <div class="word" style="left: 80%;top: 12.3%;font-size: 0.8rem;color: #4976BA">{{ data.PR_Dim08 }}</div>
- <div class="word career" style="left: 14%;top: 36%;font-size: 0.6rem;font-weight: bold;line-height:1rem">
+ <div class="word" style="left: 40%;top: 9.8%;font-size: 0.8rem;color: #34BBC4">{{ data.PR_Dim01 }}</div>
+ <div class="word" style="left: 40%;top: 18.4%;font-size: 0.8rem;color: #E1AD04">{{ data.PR_Dim02 }}</div>
+ <div class="word" style="left: 40%;top: 26.6%;font-size: 0.8rem;color: #6D67AD">{{ data.PR_Dim03 }}</div>
+ <div class="word" style="left: 40%;top: 35.6%;font-size: 0.8rem;color: #EC7864">{{ data.PR_Dim04 }}</div>
+ <div class="word" style="left: 80%;top: 9.8%;font-size: 0.8rem;color: #D78EBB">{{ data.PR_Dim05 }}</div>
+ <div class="word" style="left: 80%;top: 18.4%;font-size: 0.8rem;color: #E8497D">{{ data.PR_Dim06 }}</div>
+ <div class="word" style="left: 80%;top: 26.6%;font-size: 0.8rem;color: #62BEA4">{{ data.PR_Dim07 }}</div>
+ <div class="word" style="left: 80%;top: 35.6%;font-size: 0.8rem;color: #4976BA">{{ data.PR_Dim08 }}</div>
+ </div>
+ <div style="border:2px solid #F3EEE3;border-radius: 25px;margin-left: 8%;margin-right: 8%;">
+ <div style="font-size: 0.9rem;font-weight: bold;line-height: 25px;padding: 15px;">
1.{{data.occ1H}}<br>
2.{{data.occ2H}}<br>
3.{{data.occ3H}}<br>
@@ -32,7 +33,12 @@
9.{{data.occ9H}}<br>
10.{{data.occ10H}}
</div>
- <div class="word career" style="left: 14%;top: 71%;font-size: 0.6rem;font-weight: bold;line-height:1rem">
+ </div>
+ <div class="report">
+ <el-image :src="require('@/assets/report/page3-1.png')"></el-image>
+ </div>
+ <div style="border:2px solid #F3EEE3;border-radius: 25px;margin-left: 8%;margin-right: 8%;">
+ <div style="font-size: 0.9rem;font-weight: bold;line-height: 25px;padding: 15px;">
1.{{data.occ1L}}<br>
2.{{data.occ2L}}<br>
3.{{data.occ3L}}<br>
@@ -46,15 +52,15 @@
</div>
</div>
<div class="report">
- <div v-if="data.condition != null">
+ <div v-if="data.condition != null && data.condition != ''">
<el-image :src="require('@/assets/report/page4.png')"></el-image>
</div>
- <div v-if="data.condition == null">
+ <div v-if="data.condition == null || data.condition == ''">
<el-image :src="require('@/assets/report/page4-1.png')"></el-image>
</div>
</div>
<div class="report">
- <el-image :src="require('@/assets/report/page5.png')"></el-image>
+ <el-image :src="require('@/assets/report/page5.jpg')"></el-image>
</div>
</div>
</template>
@@ -67,7 +73,6 @@
data () {
return {
tokenId: this.$route.query.tokenId,
- condition: true,
data: {
occ1L: '鍦拌川鍕樻帰宸ョ▼鎶�鏈汉鍛橈紙姣斿鍦拌川鐭夸骇璋冩煡宸ョ▼鎶�鏈汉鍛橈級',
occ3L: '鐭垮北宸ョ▼鎶�鏈汉鍛橈紙姣斿閫夌熆涓庣熆鐗╁姞宸ュ伐绋嬫妧鏈汉鍛橈級',
--
Gitblit v1.9.1