diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 3634cc7..d6c9dcf 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -55,7 +55,7 @@ export const post = (sevmethod, params) => {
       .then(response => {
         resolve(response.data)
       }, error => {
-        Dialog(error.message)
+        // Dialog(error.message)
         reject(error.message)
       })
       .catch((error) => {
diff --git a/src/images/bg_title_j.png b/src/images/bg_title_j.png
new file mode 100644
index 0000000..fe62c53
Binary files /dev/null and b/src/images/bg_title_j.png differ
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index d39246f..465fe37 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -109,12 +109,12 @@
                         <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>
+                        <div class="sh_machine jzjcss">
+                          <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
+                        </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
diff --git a/src/pages/modules/processproduction/three.vue b/src/pages/modules/processproduction/three.vue
index 3ecef85..b130225 100644
--- a/src/pages/modules/processproduction/three.vue
+++ b/src/pages/modules/processproduction/three.vue
@@ -8,8 +8,10 @@
 <script>
 // import one from './one.vue'
 // import two from './two.vue'
-import one from '../homepage/one.vue'
-import two from '../homepage/two.vue'
+// import one from '../homepage/one.vue'
+// import two from '../homepage/two.vue'
+import one from '../takeshape/one.vue'
+import two from '../takeshape/two.vue'
 export default {
   components: {
     one,
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 4e08c50..b1f8bd4 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -26,6 +26,53 @@
                     </div>
                 </div>
                 <div class="center_content">
+                    <div class="machine_wrap lz_wrap_3">
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div v-for="(e,i) in [1,2,3]" :key="i" class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div v-for="(e,i) in [1,2,3]" :key="i" class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="lz_boxs">
+                        <div class="lz">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                    </div>
                     <div class="machine_wrap yyj_wrap_1">
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_2.png" alt="">
@@ -78,6 +125,9 @@
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_3.png" alt="">
                         </div>
+                        <div class="sh_machine jzjcss">
+                          <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
+                        </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
@@ -116,7 +166,10 @@
                     </div>
                     <div class="machine_wrap cyj_wrap_3">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_2_gray.png" alt="">
+                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        </div>
+                        <div class="sh_machine cyj_2">
+                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_4.png" alt="">
@@ -173,6 +226,55 @@
                           <img src="../../../images/workshop/cyj_1_gray.png" alt="">
                         </div>
                     </div>
+                    <div class="machine_wrap cyj_wrap_1 cyj_wrap_7">
+                      <div class="sh_machine cyj_1">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap cyj_wrap_1 cyj_wrap_8">
+                      <div class="sh_machine cyj_1">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                      <div class="sh_machine cyj_2">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                      <div class="sh_machine kongtuopan_3">
+                        <img src="../../../images/workshop/ktp.png" alt="">
+                      </div>
+                      <div class="sh_machine kongtuopan_4">
+                        <img src="../../../images/workshop/ktp.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1 mtp_wrap_2">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1 mtp_wrap_3">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1 mtp_wrap_4">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1 mtp_wrap_5">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
+                    <div class="machine_wrap mtp_wrap_1 mtp_wrap_6">
+                      <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i">
+                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -183,6 +285,7 @@
 @import '~@css/mixin'
 .n_container
     _wh(100%, 100%)
+    overflow hidden
 .n_header
     _wh(100%, 8%)
     _bis('../../../images/bg_header.jpg')
@@ -252,7 +355,7 @@
   width 16%
   height 14%
   top 20%
-  right -1%
+  right -2%
   transform rotate(90deg)
   .yyj
     width 28.22%
@@ -292,7 +395,7 @@
   width 16%
   height 14%
   top 20%
-  right 12%
+  right 10%
   transform rotate(90deg)
   .yyj
     width 28.22%
@@ -332,114 +435,120 @@
 .cyj_wrap_1
   width 11%
   height 20%
-  top 25%
-  right 30%
+  top 23%
+  right 26%
   transform rotate(90deg)
   .cyj_1
     width 25%
     top 0
   .cyj_2
     width 25%
-    top 100%
+    top 90%
+  .jzjcss
+    width: 32%;
+    left: 25%;
+    top: 43%;
   .weilan
     width 70%
     left auto
     right 0
-    top 55%
+    top 48%
   .robot
     width: 18%;
-    top: 77%;
+    top: 71%;
     left: auto;
     right: 19%;
   .kongtuopan_1
     width 14.5%
-    top 60%
+    top 53%
     left auto
     right 35%
   .kongtuopan_2
     width 14.5%
-    top 60%
+    top 53%
     left auto
     right 12%
   .kongtuopan_3
     width 14.5%
-    top 96%
+    top 90%
     left auto
     right 35%
   .kongtuopan_4
     width 14.5%
-    top 96%
+    top 90%
     left auto
     right 12%
 .cyj_wrap_2
   width 11%
   height 20%
-  top 25%
-  left 40%
+  top 23%
+  left 44%
   transform rotate(90deg)
   .cyj_1
     width 25%
-    top 0
   .cyj_2
     width 25%
-    top 100%
+    top 90%
   .kongtuopan_1
     width 14.5%
-    top: 20%;
-    left: 54%;
+    top: 19%;
+    left: 38%;
     transform rotate(90deg)
   .kongtuopan_2
     width 14.5%
     top: 50%;
-    left: 54%;
+    left: 38%;
     transform rotate(90deg)
   .kongtuopan_3
     width 14.5%
-    top 120%
-    left: 54%;
+    top: 106%;
+    left: 38%;
     transform rotate(90deg)
   .kongtuopan_4
     width 14.5%
-    top 150%
-    left: 54%;
+    top: 139%;
+    left: 38%;
     transform rotate(90deg)
 .cyj_wrap_3
   width 11%
-  height 9%
-  top: 28%;
-  left: 22%;
+  height 20%
+  top: 23%;
+  left: 25%;
   transform rotate(90deg)
   .cyj_1
-    width 37%
+    width: 25%;
+  .cyj_2
+    width 25%
+    top 90%
   .weilan
-    width 60%
+    width 70%
     left auto
     right 0
-    top 2%
+    top: 37%;
   .robot
     width 21%
-    top 36%
-    left 46%
+    top: 62%;
+    left: 43%;
   .kongtuopan_1
     width 14.5%
-    top: 41%;
+    top: 53%;
     left: auto;
-    right: 8%;
+    right: 13%;
     transform rotate(90deg)
   .kongtuopan_2
     width 14.5%
-    top auto
-    bottom: -7%;
+    top: auto;
+    bottom: -1%;
     left: auto;
-    right: 8%;
+    right: 13%;
     transform rotate(90deg)
 .cyj_wrap_4
-  left 8%
+  left 7%
 .yyj_wrap_3
   width 16%
   height 14%
   top: 62%;
-  right: 12%;
+  right: 10%;
   transform rotate(90deg)
   .yyj
     width 28.22%
@@ -455,10 +564,86 @@
     bottom 0
 .cyj_wrap_5
   left auto
-  right 30%
+  right 26%
   top 53.6%
 .cyj_wrap_6
-  left auto
-  right 49%
+  left 44%
   top 53.6%
+.cyj_wrap_7
+  left: 21%;
+  top: 53.6%;
+.cyj_wrap_8
+  left auto
+  left 7%
+  top 53.6%;
+  .kongtuopan_3
+    width 14.5%
+    top: 106%;
+    left: -17%
+    transform rotate(90deg)
+  .kongtuopan_4
+    width 14.5%
+    top: 139%;
+    left: -17%
+    transform rotate(90deg)
+.mtp_wrap_1
+  width 1.5%
+  height 7.4%
+  top: 72%;
+  right: 3.6%;
+  transform rotate(90deg)
+  .mtp
+    width 100%
+    img
+      _wh(100%, auto)
+.mtp_wrap_2
+  top 76%
+.mtp_wrap_3
+  top 86%
+.mtp_wrap_4
+  top 90%
+.mtp_wrap_5
+  right 27%
+  top 86%
+.mtp_wrap_6
+  right 27%
+  top 90%
+.lz_wrap_3
+  width 2%
+  height 100%
+  top: -46%;
+  right: 26%;
+  transform rotate(90deg)
+  .lz_boxs
+    position relative
+    top 0
+    left 0
+    _wh(100%, 100%)
+    .lz
+      width 100%
+      img
+        _wh(100%, auto)
+    &:nth-child(1)
+      height: 8%;
+    &:nth-child(2)
+      height: 17%;
+    &:nth-child(3)
+      height: 8%;
+    &:nth-child(4)
+      height: 30%;
+    &:nth-child(5)
+      height: 13%;
+      left: 200%
+    &:nth-child(6)
+      height: 26%;
+      left: 100%
+    &:nth-child(7)
+      height: 53%;
+      left: 200%
+    &:nth-child(8)
+      height: 26%;
+      left: 200%
+    &:nth-child(9)
+      height: 8%;
+      left: 200%
 </style>
diff --git a/src/pages/modules/takeshape/two.vue b/src/pages/modules/takeshape/two.vue
index e69de29..f1b5226 100644
--- a/src/pages/modules/takeshape/two.vue
+++ b/src/pages/modules/takeshape/two.vue
@@ -0,0 +1,264 @@
+<template>
+    <div class="n_container">
+        <div class="n_header">
+            <div class="n_header_h1">
+                <h1>据控制中心</h1>
+            </div>
+        </div>
+        <div class="n_body_container">
+            <div class="n_body_container_wraper">
+                <div class="n_content">
+                    <div class="item_wrap">
+                        <div class="item_tip item_tip_bg_s">
+                            <div class="item_tip_left">当日压制任务</div>
+                        </div>
+                        <div class="item_content">
+                            <div class="scroll_wrap">
+                                <ul class="scroll_tab_1">
+                                    <li>任务号</li>
+                                    <li>设备</li>
+                                    <li>BOM号</li>
+                                    <li>生产物料</li>
+                                    <li>厂家</li>
+                                    <li>计划量(块)</li>
+                                    <li>已生产(块)</li>
+                                    <li>碾次</li>
+                                    <li>生产状态</li>
+                                    <li>开始时间</li>
+                                    <li>结束时间</li>
+                                </ul>
+                                <div class="scroll_container_1">
+                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                        <ul class="scroll-ul_1">
+                                            <li v-for="(e, i) in array1" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.time}}</div>
+                                                <div class="scroll-ul_1_div">{{e.code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.info}}</div>
+                                                <div class="scroll-ul_1_div">{{e.status}}</div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                            </li>
+                                        </ul>
+                                    </vue-seamless-scroll>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="n_content n_bottom_content">
+                    <div class="item_wrap">
+                        <div class="item_tip item_tip_bg_s">
+                            <div class="item_tip_left">成型库存</div>
+                        </div>
+                        <div class="item_content">
+                            <div class="scroll_wrap">
+                                <ul class="scroll_tab_1 scroll_tab_2">
+                                    <li>货位</li>
+                                    <li>物料编码</li>
+                                    <li>物料名称</li>
+                                    <li>数量</li>
+                                    <li>载具号</li>
+                                    <li>碾次</li>
+                                    <li>入库时间</li>
+                                </ul>
+                                <div class="scroll_container_1 scroll_container_2">
+                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                        <ul class="scroll-ul_1 scroll-ul_2">
+                                            <li v-for="(e, i) in array1" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.time}}</div>
+                                                <div class="scroll-ul_1_div">{{e.code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.info}}</div>
+                                                <div class="scroll-ul_1_div">{{e.status}}</div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                            </li>
+                                        </ul>
+                                    </vue-seamless-scroll>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item_wrap">
+                        <div class="item_tip item_tip_bg_s">
+                            <div class="item_tip_left">成型出入库</div>
+                        </div>
+                        <div class="item_content">
+                            <div class="scroll_wrap">
+                                <ul class="scroll_tab_1 scroll_tab_3">
+                                    <li>类别</li>
+                                    <li>物料编码</li>
+                                    <li>物料名称</li>
+                                    <li>数量</li>
+                                    <li>载具号</li>
+                                    <li>碾次</li>
+                                    <li>货位</li>
+                                    <li>出入时间</li>
+                                </ul>
+                                <div class="scroll_container_1 scroll_container_3">
+                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                        <ul class="scroll-ul_1 scroll-ul_3">
+                                            <li v-for="(e, i) in array1" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.time}}</div>
+                                                <div class="scroll-ul_1_div">{{e.code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.info}}</div>
+                                                <div class="scroll-ul_1_div">{{e.status}}</div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                                <div class="scroll-ul_1_div"></div>
+                                            </li>
+                                        </ul>
+                                    </vue-seamless-scroll>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      array1: [{time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}]
+    }
+  },
+  computed: {
+    defaultOption1 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@css/mixin'
+.n_container
+    _wh(100%, 100%)
+    overflow hidden
+.n_header
+    _wh(100%, 8%)
+    _bis('../../../images/bg_header.jpg')
+.n_header_h1
+    _wh(100%, 100%)
+    _fj(row, flex-start)
+    _bis('../../../images/top_right.png',auto,,left)
+    h1
+        _font(32px, 1, #fff,,right)
+        padding-bottom 2%
+        letter-spacing 6px
+        font-family "阿里妈妈数黑体" !important
+        padding-left 3px
+.n_body_container
+    _wh(100%, 92%)
+    padding 40px 50px 20px 0
+    _bis('../../../images/bg_content_r.jpg')
+.n_body_container_wraper
+    _wh(100%, 100%)
+.n_content
+    _wh(100%, 49.75%)
+    &:nth-child(2)
+        margin-top .5%
+.n_bottom_content
+    _fj(row)
+    .item_wrap
+        width calc(50% - 8px)
+        &:nth-child(2)
+            margin-left 16px
+    .item_tip_bg_s
+        _bis('../../../images/bg_title_s.png')
+.item_wrap
+    _wh(100%, 100%)
+.item_tip
+    _wh(100%, 32px)
+    line-height 32px
+    padding 0 10px
+.item_tip_bg_s
+    _bis('../../../images/bg_title_j.png')
+.item_tip_left
+    _wh(60%, 100%)
+    font-family "SourceHanSansCN"
+    _font(18px, inherit, #fff, 700, left)
+    letter-spacing 2px
+    text-shadow 0 0 9px #159AFF
+    padding-left 34px
+    _bis('../../../images/bg_title_tip.png', 22px, 22px, left)
+.item_content
+    _wh(100%, calc(100% - 32px))
+    padding 10px 0
+.scroll_wrap
+    _wh(100%, 100%)
+    padding 0 5px
+    border 1px solid rgba(8,205,248,0.3)
+.scroll_tab_1
+  _wh(100%, 40px)
+  border-bottom 1 solid rgba(8,205,248,0.3)
+  li
+    float left
+    width 9%
+    _font(14px,40px,#78B1DE,,center)
+    word-wrap break-word
+    word-break break-all
+    white-space nowrap
+    padding 0 5px
+    overflow hidden
+    box-sizing border-box
+    &:nth-child(8)
+        width 10%
+.scroll_tab_2 li
+    width 14%
+    &:nth-child(7)
+        width 16%
+.scroll_tab_3 li
+    width 12.5%
+.scroll_container_1
+  width 100%
+  height calc(100% - 40px)
+  overflow hidden
+.scroll-ul_1
+  li
+    _wh(100%, 44px)
+    border-bottom 1 solid rgba(8,205,248,0.3)
+    &:nth-child(even)
+      background rgba(1,24,52,0.60)
+      box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
+    .scroll-ul_1_div
+      float left
+      _wh(9%, 44px)
+      _fj(row, center)
+      _font(14px, 16px, #fff,,center)
+      word-wrap break-word
+      word-break break-all
+      // white-space nowrap
+      padding 0 5px
+      overflow hidden
+      &:nth-child(8)
+        width 10%
+.scroll-ul_2 li .scroll-ul_1_div
+    width 14%
+    &:nth-child(7)
+        width 16%
+.scroll-ul_3 li .scroll-ul_1_div
+    width 12.5%
+</style>