shaogen1995 3 년 전
부모
커밋
8567a3614b
4개의 변경된 파일13개의 추가작업 그리고 16개의 파일을 삭제
  1. 9 13
      web/public/static/css/main.css
  2. 1 1
      web/src/views/gui/compomemt/antique.vue
  3. BIN
      webM/src/assets/img/close2.png
  4. 3 2
      webM/src/views/gui/component/antique.vue

+ 9 - 13
web/public/static/css/main.css

@@ -3343,7 +3343,7 @@ a.hasHover:hover, a:active {
 }
 
 .darkGlass {
-    background-color: rgba(0, 0, 0, .45)
+    background-color: rgba(0, 0, 0, .45);
 }
 
 .ui-icon {
@@ -3816,7 +3816,7 @@ a.hasHover:hover, a:active {
 }
 
 #view-controllers .darkGlass {
-    background-color: rgba(0, 0, 0, .45)
+    background-color: rgba(0, 0, 0, .45);
 }
 
 #view-controllers .darkGlass.active {
@@ -3962,7 +3962,7 @@ a.hasHover:hover, a:active {
 }
 
 #drawer.open {
-    height: 130px
+    height: 140px
 }
 
 #drawer-container.drawerOpen #drawer.open {
@@ -4020,7 +4020,8 @@ a.hasHover:hover, a:active {
 .frame-container {
     float: left;
     width: calc(100% - 58px);
-    height: 100%
+    height: 100%;
+    background-color: #A1653B;
 }
 
 .fullWidth .frame-container {
@@ -4030,10 +4031,8 @@ a.hasHover:hover, a:active {
 .frame {
     padding-top: 8px;
     width: 100%;
-    height: 100%;
+    height: 132px;
     float: left;
-    display: flex;
-    justify-content: center;
     background-color: #A1653B;
     position: relative;
 }
@@ -4043,7 +4042,7 @@ a.hasHover:hover, a:active {
 }
 
 .frame .slidee {
-    margin: 0;
+    margin: 0 auto;
     padding: 0;
     height: 100%;
     list-style: none
@@ -4124,18 +4123,15 @@ a.hasHover:hover, a:active {
 }
 
 .scrollbar {
-    width: calc(100% - 10px);
-    margin: 0 5px;
+    width: 100%;
     height: 8px;
     float: left;
-    border-radius: 5px;
-    background: rgba(0, 0, 0, .75)
 }
 
 .scrollbar .handle {
     width: 100px;
     height: 100%;
-    background: #00F3FF;
+    background: #fff;
     border-radius: 5px
 }
 

+ 1 - 1
web/src/views/gui/compomemt/antique.vue

@@ -419,7 +419,7 @@ export default {
     background-size: 100% 100%;
     display: flex;
     .ifrCon {
-      background-color: #d9d9d9;
+      background-color: #fff6d2;
       position: relative;
       width: 558px;
       height: 478px;

BIN
webM/src/assets/img/close2.png


+ 3 - 2
webM/src/views/gui/component/antique.vue

@@ -63,7 +63,7 @@
         <iframe :src="mySrc" frameborder="0" v-else></iframe>
         <!-- 全屏按钮 -->
         <div class="fullM" :class="{ fullX: fullscreen }" @click="screen">
-          <img src="@/assets/img/close.png" alt="" v-if="fullscreen" />
+          <img src="@/assets/img/close2.png" alt="" v-if="fullscreen" />
           <img src="@/assets/img/tab3Full.png" alt="" v-else />
         </div>
       </div>
@@ -219,7 +219,7 @@ export default {
       z-index: -1;
     }
     .ifrCon {
-      background-color: #d9d9d9;
+      background-color: #fff6d2;
       position: relative;
       width: 100%;
       height: calc(100% - 60px);
@@ -244,6 +244,7 @@ export default {
         }
       }
       .fullX {
+        z-index: 99;
         position: fixed;
         left: 50%;
         transform: translateX(-50%);