diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index a4e4336..815de77 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -83,8 +83,8 @@ html, body { height: 100%; /* min-width: 1440px; min-height: 789px; */ - /* width: 1920px; - width: 3840px; + /* width: 1920px; */ + /* width: 3840px; height: 1080px; */ } diff --git a/src/images/workshop/robot_4_gray.png b/src/images/workshop/robot_4_gray.png new file mode 100644 index 0000000..84ec736 Binary files /dev/null and b/src/images/workshop/robot_4_gray.png differ diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue index f4852d2..5e61a3d 100644 --- a/src/pages/modules/homepage/one.vue +++ b/src/pages/modules/homepage/one.vue @@ -41,7 +41,7 @@
-
+
@@ -149,8 +149,14 @@
-
+ +
+ +
+
+
@@ -657,6 +663,7 @@ export default { @import '~@css/mixin' .n_container _wh(100%, 100%) + overflow hidden .n_header _wh(100%, 8%) _bis('../../../images/bg_header.jpg') @@ -707,6 +714,7 @@ export default { position relative z-index 1 _wh(100%, 100%) + top -5% // _bis('../../../images/workshop/workshop_l.png') .machine_wrap position absolute @@ -841,15 +849,12 @@ export default { .yyj_wrap_1 width 16% height 14% - top 5.5% - left 48% + top 5% + left 43% transform scale(0.9) .yyj width 28.22% - height 42% left 30.5% - img - _wh(100%, 100%) .wzm _wh(50.9%, 46.95%) background-color #d9d9d9 @@ -873,35 +878,25 @@ export default { transform rotate(270deg) .kongtuopan_1 width 15% - height 13% top auto left auto - bottom 6% + bottom 20% right 30% - img - _wh(100%, 100%) .kongtuopan_2 width 15% - height 13% top auto left auto - bottom 6% + bottom 20% right 14% - transform rotate(180deg) - img - _wh(100%, 100%) .yyj_wrap_2 width 16% height 14% top 19% - left 48% + left 43% transform scale(0.9) .yyj width 28.22% - height 42% left 30.5% - img - _wh(100%, 100%) .wzm _wh(50.9%, 46.95%) background-color #d9d9d9 @@ -925,183 +920,129 @@ export default { transform rotate(90deg) .kongtuopan_1 width 15% - height 13% - top 44% + top 52% left auto - right 15% + right 6% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_2 width 15% - height 13% top auto left auto bottom -10% - right 15% + right 17% transform rotate(-90deg) - img - _wh(100%, 100%) .cyj_wrap_1 width 11% - height 14% - top 37% - left 52.5% + height 9% + top 35% + left 48.3% .cyj_1 - width 40% - height 48% - img - _wh(100%, 100%) + width 20% .cyj_2 - width 40% - height 48% - top auto - bottom 0 - img - _wh(100%, 100%) + width 20% + top 100% .weilan - _wh(60%, 70%) + width 70% left auto right 0 - top 15% - img - _wh(100%, 100%) + top 55% .robot - width 21% - top 46% - left auto - right 17% + width: 20%; + top: 84%; + left: auto; + right: 17%; .kongtuopan_1 - width 15% - height 13% - top 29% - left auto - right 35% - img - _wh(100%, 100%) + width: 20%; + top: 62%; + left: auto; + right: 35%; .kongtuopan_2 - width 15% - height 13% - top 29% - left auto - right 12% - img - _wh(100%, 100%) + width: 20%; + top: 62%; + left: auto; + right: 5%; .kongtuopan_3 - width 15% - height 13% - top auto - left auto - right 35% - bottom 20% - img - _wh(100%, 100%) + width: 20%; + top: 103%; + left: auto; + right: 35%; .kongtuopan_4 - width 15% - height 13% - top auto - left auto - right 12% - bottom 20% - img - _wh(100%, 100%) + width: 20%; + top: 103%; + left: auto; + right: 5%; .cyj_wrap_2 width 11% - height 14% - top 52% - left 52.5% + height 9% + top 53% + left 48.5% .cyj_1 - width 40% - height 48% - img - _wh(100%, 100%) + width 20% .cyj_2 - width 40% - height 48% - top auto - bottom 0 - img - _wh(100%, 100%) + width 20% + top 100% .kongtuopan_1 - width 15% - height 13% - top 6% + width 20% + top 20% left 44% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_2 - width 15% - height 13% - top 31% + width 20% + top 68% left 44% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_3 - width 15% - height 13% - top auto - bottom 31% + width 20% + top 120% left 44% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_4 - width 15% - height 13% - top auto - bottom 4% + width 20% + top 160% left 44% transform rotate(90deg) - img - _wh(100%, 100%) .cyj_wrap_3 width 11% height 9% - top 69% - left 52.5% + top 71% + left 48.5% + // .cyj_1 + // width: 26%; + // top: 15%; + // left: 8%; .cyj_1 - width 37% - height 95% - img - _wh(100%, 100%) + width 20% + .cyj_2 + width 20% + top 100% .weilan - _wh(60%, 100%) + width 70% left auto right 0 - img - _wh(100%, 100%) - .robot - width 21% - top 36% - left 46% - .kongtuopan_1 - width 15% - height 13% top 29% + .robot + width: 18%; + top: 67%; + left: 40%; + .kongtuopan_1 + width 20% + top 65% left auto - right 13% + right 11% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_2 - width 15% - height 13% - top auto - bottom 9% - left auto - right 13% + width 20% + top: 117%; + left: auto; + right: 11%; transform rotate(90deg) - img - _wh(100%, 100%) .cyj_wrap_4 - top 80% + top 89% .yyj_wrap_3 width 16% height 14% top 19% - right 8% + right 13% transform scale(0.9) .yyj width 28.22% @@ -1117,37 +1058,29 @@ export default { bottom 0 .cyj_wrap_5 left auto - right 12% + right 17% .cyj_wrap_6 left auto - right 12% - top 52% + right 17% + top 53% .cyj_wrap_7 left auto - right 12% - top 69% + right 17% + top 76% .cyj_wrap_8 left auto - right 12% - top 80% + right 17% + top 89% .kongtuopan_3 - width 15% - height 13% - top auto - bottom 31% - left -20% + width 20% + top 120% + left -30% transform rotate(90deg) - img - _wh(100%, 100%) .kongtuopan_4 - width 15% - height 13% - top auto - bottom 4% - left -20% + width 20% + top 160% + left -30% transform rotate(90deg) - img - _wh(100%, 100%) .lz_wrap_4 width 2% height 63% diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index fd0d06b..dd48f0f 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -103,7 +103,7 @@
- +
@@ -118,7 +118,7 @@
- +
@@ -458,6 +458,7 @@ export default { @import '~@css/mixin' .n_container _wh(100%, 100%) + overflow hidden .n_header _wh(100%, 8%) _bis('../../../images/bg_header.jpg') @@ -509,6 +510,7 @@ export default { position relative z-index 1 _wh(100%, 100%) + top -5% // _bis('../../../images/workshop/workshop_r.png') .scroll_wrap _wh(100%, 100%) @@ -596,10 +598,10 @@ export default { img _wh(100%, auto) .mtp_wrap_2 - top 30% + top 35% .gtssj_wrap_1 width 2.5% - top 30% + top 35% left 8% .gtssj width 100% @@ -607,7 +609,7 @@ export default { _wh(100%, auto) .cpj_wrap_1 width 4.5% - top 33% + top 38% left 6.5% .cpj width 100% diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue index e69de29..4e08c50 100644 --- a/src/pages/modules/takeshape/one.vue +++ b/src/pages/modules/takeshape/one.vue @@ -0,0 +1,464 @@ + + +