From 6257e314815a7c24b7184480598ce449da088e38 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 6 Jun 2023 09:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/reset.css           |  4 ++--
 src/pages/modules/homepage/one.vue | 19 +++++++++++++------
 src/pages/modules/homepage/two.vue |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index 815de77..e04e35d 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -84,8 +84,8 @@ html, body {
      /* min-width: 1440px;
      min-height: 789px; */
      /* width: 1920px; */
-     /* width: 3840px;
-     height: 1080px; */
+     /* width: 3840px; */
+     /* height: 1080px; */
 }
  
 body {
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 5e61a3d..d39246f 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -41,7 +41,7 @@
                         </div>
                       </div>
                       <div class="machine_wrap hlj_wrap">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]" :key="i"  class="sh_machine hlj">
+                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i"  class="sh_machine hlj">
                           <img src="../../../images/workshop/hlj.png" alt="">
                         </div>
                       </div>
@@ -109,6 +109,9 @@
                         <div class="sh_machine cyj_2">
                           <img src="../../../images/workshop/cyj_1_gray.png" alt="">
                         </div>
+                        <div class="sh_machine jzjcss">
+                          <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
+                        </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_3.png" alt="">
                         </div>
@@ -266,8 +269,8 @@ export default {
   },
   methods: {
     setEchart1 () {
-      let date = ['碾机1', '碾机2', '碾机3', '碾机4', '碾机5', '碾机6', '碾机7', '碾机8', '碾机9', '碾机10']
-      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000']
+      let date = ['碾机1', '碾机2', '碾机3', '碾机4', '碾机5', '碾机6', '碾机7', '碾机8', '碾机9', '碾机10', '碾机11', '碾机12', '碾机13', '碾机14', '碾机15', '碾机16']
+      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000', '500', '600', '700', '800', '500', '600']
       let option = {
         grid: {
           top: 50,
@@ -372,9 +375,9 @@ export default {
       }
     },
     setEchart2 () {
-      let date = ['压机1', '压机2', '压机3', '压机4', '压机5', '压机6', '压机7', '压机8', '压机9', '压机10']
-      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000']
-      let data2 = ['50', '180', '70', '100', '50', '70', '100', '180', '100', '120']
+      let date = ['压机1', '压机2', '压机3', '压机4', '压机5', '压机6', '压机7', '压机8', '压机9', '压机10', '压机11', '压机12', '压机13', '压机14', '压机15', '压机16']
+      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000', '500', '600', '700', '800', '500', '600']
+      let data2 = ['50', '180', '70', '100', '50', '70', '100', '180', '100', '120', '50', '180', '70', '100', '50', '70']
       let option = {
         grid: {
           top: 50,
@@ -941,6 +944,10 @@ export default {
   .cyj_2
     width 20%
     top 100%
+  .jzjcss
+    width: 28.5%;
+    left: 21%;
+    top: 36%;
   .weilan
     width 70%
     left auto
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index dd48f0f..70864bf 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -195,7 +195,7 @@ export default {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 15, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom