From c6dd775e9437ba929a2633c1a9f4d71379e5d19b Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 15:14:58 +0800
Subject: [PATCH] Merge branch 'v13-20230413'
---
src/views/report/reportH5.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/report/reportH5.vue b/src/views/report/reportH5.vue
index 6624eaf..f5f795f 100644
--- a/src/views/report/reportH5.vue
+++ b/src/views/report/reportH5.vue
@@ -1,9 +1,9 @@
<template>
- <div id="app">
+ <div id="app" style="margin:auto">
<div class="report">
<el-image :src="require('@/assets/report/page1.jpg')"></el-image>
- <div class="word" style="left: 23.5%;top: 68.6%;font-size: 0.8rem;color: #313157">銆恵{ data.questionnaireTaker }}銆�</div>
- <div class="word" style="left: 27%;top: 71.2%;font-size: 0.8rem;color: #313157">銆恵{ data.reportGenerationDate }}銆�</div>
+ <div class="word" style="left: 25%;top: 68.6%;font-size: 0.8rem;color: #313157">{{ data.questionnaireTaker }}</div>
+ <div class="word" style="left: 28.5%;top: 71.2%;font-size: 0.8rem;color: #313157">{{ data.reportGenerationDate }}</div>
</div>
<div class="report">
<el-image :src="require('@/assets/report/page2.png')"></el-image>
@@ -20,7 +20,7 @@
<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.3%;font-size: 0.6rem;font-weight: bold;line-height:25px">
+ <div class="word career" style="left: 14%;top: 36%;font-size: 0.6rem;font-weight: bold;line-height:1rem">
1.{{data.occ1H}}<br>
2.{{data.occ2H}}<br>
3.{{data.occ3H}}<br>
@@ -32,7 +32,7 @@
9.{{data.occ9H}}<br>
10.{{data.occ10H}}
</div>
- <div class="word career" style="left: 14%;top: 72%;font-size: 0.6rem;font-weight: bold;line-height:25px">
+ <div class="word career" style="left: 14%;top: 71%;font-size: 0.6rem;font-weight: bold;line-height:1rem">
1.{{data.occ1L}}<br>
2.{{data.occ2L}}<br>
3.{{data.occ3L}}<br>
@@ -373,13 +373,13 @@
.career {
display: inline-block;
- width: 260px;
+ width: 72%;
/*瓒呭嚭閮ㄥ垎闅愯棌*/
- overflow: hidden;
+ /*overflow: hidden;*/
/*鏂囨湰涓嶆崲琛�*/
- white-space: nowrap;
+ /*white-space: nowrap;*/
/*瓒呭嚭涓嶅皝鐢ㄤ笁涓渷鐣ュ彿浠ｆ浛*/
- text-overflow: ellipsis;
+ /*text-overflow: ellipsis;*/
}
#app {
--
Gitblit v1.9.1