From cb81eef3d9aabe280e506fc7971c539542cf13f7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 19 Aug 2021 15:12:01 +0800
Subject: [PATCH] 冲突

---
 src/views/exam/papers.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/views/exam/papers.vue b/src/views/exam/papers.vue
index 5bdc6c1..a5310da 100644
--- a/src/views/exam/papers.vue
+++ b/src/views/exam/papers.vue
@@ -1,6 +1,9 @@
 <template>
-  <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
+<div class="securityPapers">
+
   <iframe :src="url" style="width: 100%; height: 100%" frameborder="0"></iframe>
+</div>
+  <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
 </template>
 
 <script>

--
Gitblit v1.9.3