fix

src/pages/iasf/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="wrap">
     <el-carousel class="carousel"
+                 :style="{height}"
                  :interval="6000"
                  :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
                  :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
@@ -295,6 +296,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
+      height: 0,
       articles: [],
       articles1: [],
       articles2: [],
@@ -310,6 +312,7 @@ export default {
     }
   },
   mounted () {
+    this.height = window.innerHeight + 'px'
     new WOW().init()
   },
   methods: {
@@ -418,7 +421,7 @@ export default {
         height: 100%;
     }
     /deep/.el-carousel__container {
-        height: 100vh;
+        height: 100%;
     }
     .texts {
         position: absolute;
@@ -457,7 +460,7 @@ export default {
 }
 .inner {
     width: 1444px;
-    min-width: 70%;
+    // min-width: 70%;
 }
 .card {
     display: flex;

src/pages/overview/index.vue

@@ -340,10 +340,10 @@ export default {
     .scan-inner {
         display: flex;
         justify-content: flex-end;
-        padding-left: 20%;
+        padding-left: 19%;
     }
     .left {
-        width: 30%;
+        width: 45%;
         margin-right: 80px;
     }
     .line {
@@ -400,13 +400,60 @@ export default {
         }
     }
     .pic {
-        width: 826px;
+        width: 50%;
-        height: 700px;
+        // height: 700px;
     }
 }
-@media (max-width: 1600px) {
+@media (min-width: 2000px) {
+    .scan {
+        .scan-inner {
+            padding-left: 22%;
+        }
+    }
+}
+@media (min-width: 2400px) {
+    .scan {
+        .scan-inner {
+            padding-left: 24%;
+        }
+    }
+}
+@media (min-width: 2500px) {
+    .scan {
+        .scan-inner {
+            padding-left: 26%;
+        }
+    }
+}
+@media (min-width: 2800px) {
+    .scan {
+        .scan-inner {
+            padding-left: 29%;
+        }
+    }
+}
+@media (min-width: 3500px) {
+    .scan {
+        .scan-inner {
+            padding-left: 33.5%;
+        }
+    }
+}
+@media (min-width: 5000px) {
+    .scan {
+        .scan-inner {
+            padding-left: 38%;
+        }
+    }
+}
+@media (max-width: 1800px) {
+    .scan .scan-inner {
+        padding-left: 14%;
+    }
+}
+@media (max-width: 1500px) {
     .scan .scan-inner {
-        padding-left: 10vw;
+        padding-left: 10%;
     }
 }
 @media (max-width: 1400px) {