From 9e02465e368575bba0cf0ee0dfb483993bcc79ee Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期四, 11 五月 2023 11:44:28 +0800
Subject: [PATCH] H5报告优化

---
 /dev/null                      |    0 
 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/report/reportH5.vue  |   30 ++++++++++++++++++------------
 src/assets/report/page5.png    |    0 
 7 files changed, 18 insertions(+), 12 deletions(-)

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/views/report/reportH5.vue b/src/views/report/reportH5.vue
index f5f795f..eac5a4e 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>
@@ -54,7 +60,7 @@
       </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>

--
Gitblit v1.9.1