From 9bb5b533c3ac07dabd66cdb46150cf5a89e6c6a8 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Wed, 3 Nov 2021 11:21:56 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iHeader/index.vue      | 15 +++++++--------
 src/lycomponents/iHeaderBrand/index.vue | 19 +++++++++----------
 src/lycomponents/iHeaderMa/index.vue    | 22 +++++++++++-----------
 src/lycomponents/iLayout/index.vue      | 10 +++++++---
 src/views/Index/index.vue               | 15 ++++++++-------
 5 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/lycomponents/iHeader/index.vue b/src/lycomponents/iHeader/index.vue
index ed96577..3cc9fbc 100644
--- a/src/lycomponents/iHeader/index.vue
+++ b/src/lycomponents/iHeader/index.vue
@@ -136,18 +136,17 @@ export default {
     display: flex;
     justify-content: space-between;
     width: 100%;
-    height: auto;
+    height: 80px;
     background-image: url("../../assets/images/Index/img_toubuer.png");
     background-repeat: no-repeat;
-    background-size: cover;
+    background-size: 100% 100%;
     .iH-left {
         display: flex;
         height: 100%;
-        width: 430px;
+        width: 657px;
         margin-left: 16px;
         justify-content: flex-start;
-        margin-top: 18px;
-        width: 400px;
+        margin-top: 16px;
         .iH-left-img1 {
             width: 24px;
             height: 24px;
@@ -163,16 +162,16 @@ export default {
         }
     }
     .iH-center {
-        width: 560px;
+        width: 490px;
         height: auto;
     }
     .iH-right {
         display: flex;
         height: 100%;
-        width: 430px;
+        width: 657px;
         justify-content: flex-end;
         margin-right: 16px;
-        margin-top: 18px;
+        margin-top: 16px;
         .s1 {
             display: inline-block;
             font-size: 16px;
diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index 1fe534a..06c397d 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -36,7 +36,7 @@
 
         </div>
         <div class="iH-center">
-            <img src="../../assets/images/Index/img_toubuyi.png" width="100%" height="100%" />
+            <img src="../../assets/images/Index/img_toubuyi.png" width="100%" />
         </div>
         <div class="iH-right">
             <span class="s1">{{ clock }}</span>
@@ -191,17 +191,17 @@ export default {
     display: flex;
     justify-content: space-between;
     width: 100%;
-    height: auto;
+    height: 80px;
     background-image: url("../../assets/images/Index/img_toubuer.png");
     background-repeat: no-repeat;
-    background-size: cover;
+    background-size: 100% 100%;
     .iH-left {
         display: flex;
         height: 100%;
+        width: 657px;
         margin-left: 16px;
         justify-content: flex-start;
-        margin-top: 18px;
-        width: 657px;
+        margin-top: 16px;
         .iH-left-img1 {
             width: 24px;
             height: 24px;
@@ -217,16 +217,16 @@ export default {
         }
     }
     .iH-center {
-        width: 560px;
+        width: 490px;
         height: auto;
     }
     .iH-right {
         display: flex;
-        width: 657px;
         height: 100%;
+        width: 657px;
         justify-content: flex-end;
         margin-right: 16px;
-        margin-top: 18px;
+        margin-top: 16px;
         .s1 {
             display: inline-block;
             font-size: 16px;
@@ -243,7 +243,6 @@ export default {
             font-size: 14px;
             color: #ffffff;
             margin-left: 8px;
-            margin-top: 2px;
         }
         .m1 {
             display: inline-block;
@@ -259,7 +258,7 @@ export default {
     margin-left: 11px;
     /deep/ .anticon svg {
         font-size: 20px !important;
-        margin-top: 2px;
+        margin-top: 0px;
     }
 }
 .selHead {
diff --git a/src/lycomponents/iHeaderMa/index.vue b/src/lycomponents/iHeaderMa/index.vue
index 0be8f86..595f6b6 100644
--- a/src/lycomponents/iHeaderMa/index.vue
+++ b/src/lycomponents/iHeaderMa/index.vue
@@ -32,7 +32,7 @@
            
         </div>
         <div class="iH-center">
-            <img src="../../assets/images/Index/img_toubuyi.png" width="100%" height="100%" />
+            <img src="../../assets/images/Index/img_toubuyi.png" width="100%" />
         </div>
         <div class="iH-right">
             <span class="s1">{{ clock }}</span>
@@ -147,17 +147,17 @@ export default {
     display: flex;
     justify-content: space-between;
     width: 100%;
-    height: auto;
+    height: 80px;
     background-image: url("../../assets/images/Index/img_toubuer.png");
     background-repeat: no-repeat;
-    background-size: cover;
+    background-size: 100% 100%;
     .iH-left {
         display: flex;
         height: 100%;
+        width: 657px;
         margin-left: 16px;
         justify-content: flex-start;
-        margin-top: 18px;
-        width: 657px;
+        margin-top: 16px;
         .iH-left-img1 {
             width: 24px;
             height: 24px;
@@ -173,16 +173,16 @@ export default {
         }
     }
     .iH-center {
-        width: 560px;
+        width: 490px;
         height: auto;
     }
     .iH-right {
         display: flex;
-        width: 657px;
         height: 100%;
-        justify-content: flex-start;
+        width: 657px;
+        justify-content: flex-end;
         margin-right: 16px;
-        margin-top: 18px;
+        margin-top: 16px;
         .s1 {
             display: inline-block;
             font-size: 16px;
@@ -218,8 +218,8 @@ export default {
     }
 }
 .selHead {
-    width: 120px; 
-    margin-left: 40px; 
+    width: 120px;
+    margin-left: 40px;
     margin-right: 8px;
 }
 </style>
diff --git a/src/lycomponents/iLayout/index.vue b/src/lycomponents/iLayout/index.vue
index 833bba8..791c8fa 100644
--- a/src/lycomponents/iLayout/index.vue
+++ b/src/lycomponents/iLayout/index.vue
@@ -1,18 +1,18 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 14:25:26
- * @LastEditTime: 2021-11-02 17:24:34
+ * @LastEditTime: 2021-11-03 11:12:39
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/lycomponents/iLayout/index.vue
 -->
 <template>
     <div class="layout-container">
-        <iHeader v-if="getHeaderType == 1"></iHeader>
+        <iHeader v-if="getHeaderType == 1" :style="headerStyle"></iHeader>
         <iHeaderMa v-if="getHeaderType == 2"></iHeaderMa>
         <iHeaderBrand v-if="getHeaderType == 3"></iHeaderBrand>
         <div class="layout-body">
-            <router-view v-if="isRouterAlive && !scrollShow"></router-view>
+            <router-view v-if="isRouterAlive && !scrollShow" @changeZoom="changeZoom"></router-view>
             <vue-scroll v-if="scrollShow && isRouterAlive">
                 <router-view></router-view>
             </vue-scroll>
@@ -45,6 +45,7 @@ export default {
         return {
             isRouterAlive: true,
             scrollShow: true,
+            headerStyle: {}
         };
     },
     methods: {
@@ -54,6 +55,9 @@ export default {
                 this.isRouterAlive = true;
             });
         },
+        changeZoom() {
+         
+        }
     },
 };
 </script>
diff --git a/src/views/Index/index.vue b/src/views/Index/index.vue
index c593570..9fedd31 100644
--- a/src/views/Index/index.vue
+++ b/src/views/Index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 09:17:42
- * @LastEditTime: 2021-11-02 17:55:45
+ * @LastEditTime: 2021-11-03 10:54:35
  * @LastEditors: Please set LastEditors
  * @Description: 行业洞察
  * @FilePath: /data-show/src/views/Index/index.vue
@@ -122,16 +122,16 @@ export default {
                 this.modalObj.visible = true;
             });
         },
-        handleResize({height, ratio}) {
-            console.log(ratio)
+        handleResize({height}) {
            let h = document.body.clientHeight;
            let h2 = parseFloat(height);
+           let hx = 990/1080 * h;
            let z = 1;
-            let m = h2 - h;
-            let marginTop = -m*1.7;
+           let m = h2 - h;
+           let marginTop = -m*1.9;
            if(h > 760 && h < 1080) {
                if(h2 > h) {
-                   z = (h -90)/h2;
+                   z = hx/h2 * 0.99;
                } else {
                    z = 1;
                    marginTop = 0;
@@ -146,8 +146,9 @@ export default {
            }
          
          this.outStyle = {
-             transform: `scaleY(${z}) translate(0, ${marginTop*0.09}rem)`,
+             transform: `scaleY(${z}) translate(0, ${marginTop}px)`,
           }
+          this.$emit('changeZoom', z)
         },
         handlerSs() {