[edit][css]

src/view/iframe/tool-box/card.vue

@@ -402,23 +402,14 @@ const clickFull = () => {
         align-items: center;
         justify-content: center;
 
-        .area-iframe {
+        iframe {
+            background: #fff;
             width: 100%;
             height: 100%;
-
-            <<<<<<< HEAD iframe {
-                background: #fff;
-                width: 100%;
-                height: 100%;
-                border: medium none;
-            }
-
-            =======border: medium none;
-            >>>>>>>dev_1.1.5-1
+            border: medium none;
         }
 
 
-
         .state {
             text-align: center;
             width: 100%;