Explorar el Código

Merge branch 'qghd' of http://192.168.0.115:3000/bill/fire_control into qghd

tangning hace 3 años
padre
commit
eed06594b6
Se han modificado 2 ficheros con 22 adiciones y 16 borrados
  1. 1 1
      src/view/scene/index.vue
  2. 21 15
      src/view/scene/style.scss

+ 1 - 1
src/view/scene/index.vue

@@ -156,7 +156,7 @@ export default {
 
       this.loadSuccess = true
       this.confirm.show = false
-      this.showInfo = true
+      // this.showInfo = true  //不默认开启
     },
     goto(item) {
       if (item.type !== 1) {

+ 21 - 15
src/view/scene/style.scss

@@ -4,7 +4,7 @@
   height: 100%;
   left: 0;
   top: 0;
-
+  overflow: hidden;
   iframe {
     width: 100%;
     height: 100%;
@@ -20,7 +20,8 @@
     height: 100%;
     left: 0;
     top: 0;
-    overflow-y: auto;
+    // overflow-y: auto;
+    overflow: hidden;
     transition: transform .3s linear;
 
     &::-webkit-scrollbar {
@@ -30,18 +31,18 @@
     
     .ctrl {
       position: absolute;
-      right: 6px;
+      right: 0px;
       top: 50%;
       transform: translateY(-50%);
       background: var(--bgColor);
-      width: 14px;
+      width: 20px;
       height: 40px;
       cursor: pointer;
       
       img {
         position: absolute;
-        width: 10px;
-        height: 10px;
+        width: 12px;
+        height: 12px;
         left: 50%;
         top: 50%;
         transform: translate(-50%, -50%);
@@ -54,19 +55,19 @@
         position: absolute;
         width: 0;
         height: 0;
-        border: 10px solid transparent;
+        border: 16px solid transparent;
       }
 
       &::before {
-        left: -10px;
-        top: -10px;
+        left: -16px;
+        top: -16px;
         transform: rotate(45deg);
         border-top-color: var(--bgColor);
       }
 
       &::after {
-        left: -10px;
-        bottom: -10px;
+        left: -16px;
+        bottom: -16px;
         transform: rotate(-45deg);
         border-bottom-color: var(--bgColor);
       }
@@ -93,16 +94,21 @@
     position: absolute;
     left: 0;
     top: 0;
-    min-height: 100%;
+    // min-height: 100%;
+    height: 100%;
     padding: 20px;
     width: calc(100% - 20px);
     background: var(--bgColor);
     transition: transform .3s linear;
     box-sizing: border-box;
     
-  
-
-
+    overflow-y: auto;
+    &::-webkit-scrollbar-thumb{
+      background: (rgba(255,255,255,0.2));
+    }
+    &::-webkit-scrollbar{
+      width:4px;
+    }
     h2 {
       font-size: 20px;
       font-weight: 400;