From b17abb6229752b7fa91a2ea621889150159f39e0 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期一, 15 五月 2023 16:05:19 +0800
Subject: [PATCH] 报告优化

---
 public/element-uilib.zip                  |    0 
 src/views/exam/paper/career_interests.vue |    6 +++---
 src/views/report/reportH5.vue             |    5 ++---
 src/router.js                             |    2 +-
 4 files changed, 6 insertions(+), 7 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/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/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 eac5a4e..842f495 100644
--- a/src/views/report/reportH5.vue
+++ b/src/views/report/reportH5.vue
@@ -52,10 +52,10 @@
       </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>
@@ -73,7 +73,6 @@
   data () {
     return {
       tokenId: this.$route.query.tokenId,
-      condition: true,
       data: {
         occ1L: '鍦拌川鍕樻帰宸ョ▼鎶�鏈汉鍛橈紙姣斿鍦拌川鐭夸骇璋冩煡宸ョ▼鎶�鏈汉鍛橈級',
         occ3L: '鐭垮北宸ョ▼鎶�鏈汉鍛橈紙姣斿閫夌熆涓庣熆鐗╁姞宸ュ伐绋嬫妧鏈汉鍛橈級',

--
Gitblit v1.9.1