diff --git a/src/pages/modules/firedry/two.vue b/src/pages/modules/firedry/two.vue
index 7e429d1..a4180ab 100644
--- a/src/pages/modules/firedry/two.vue
+++ b/src/pages/modules/firedry/two.vue
@@ -34,24 +34,22 @@
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
                                     <li>货位</li>
-                                    <li>物料编码</li>
-                                    <li>物料名称</li>
+                                    <li style="width: 20%;">物料编码</li>
                                     <li>数量</li>
                                     <li>载具号</li>
-                                    <li>碾次</li>
-                                    <li>入库时间</li>
+                                    <li style="width: 15%;">碾次</li>
+                                    <li style="width: 25%;">入库时间</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.workorder_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.bom}}</div>
-                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.total_mix_frequency}}</div>
+                                                <div class="scroll-ul_1_div">{{e.point_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 20%;">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 15%;">{{e.mix_num}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 25%;">{{e.create_time}}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -67,26 +65,24 @@
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
                                     <li>类别</li>
-                                    <li>物料编码</li>
-                                    <li>物料名称</li>
+                                    <li style="width: 15%;">物料编码</li>
                                     <li>数量</li>
                                     <li>载具号</li>
                                     <li>碾次</li>
                                     <li>货位</li>
-                                    <li>出入时间</li>
+                                    <li style="width: 21%;">出入时间</li>
                                 </ul>
                                 <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="array2" :class-option="defaultOption2">
                                         <ul class="scroll-ul_1">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.workorder_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.bom}}</div>
-                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.total_mix_frequency}}</div>
-                                                <div class="scroll-ul_1_div">{{e.order_status}}</div>
+                                            <li v-for="(e, i) in array2" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.io_type}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 15%;">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.mix_num}}</div>
+                                                <div class="scroll-ul_1_div">{{e.point_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 21%;">{{e.create_time}}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -101,20 +97,35 @@
 </template>
 
 <script>
+import { firingAndDrying } from '@js/getData0'
 export default {
   name: 'one',
   data () {
     return {
+      resData: {},
       myCharts1: '',
       myCharts2: '',
-      array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
+      array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}],
+      array2: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
     }
   },
   computed: {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 11, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 7, // 开始无缝滚动的数据量 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)
+      }
+    },
+    defaultOption2 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 7, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -125,13 +136,26 @@ export default {
     }
   },
   mounted () {
-    this.setEchart1()
-    this.setEchart2()
+    this.initData()
   },
   methods: {
+    async initData () {
+      let res = await firingAndDrying()
+      this.resData = res.result
+      this.array1 = res.result.SemiFinishedGoodsList
+      this.array2 = res.result.SemiFinishedIOList
+      this.setEchart1()
+      this.setEchart2()
+    },
     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']
+      // let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000']
+      let date = []
+      let data1 = []
+      this.resData.FireInTheKilnList.map(el => {
+        date.push(el.material_code)
+        data1.push(el.qty)
+      })
       let option = {
         grid: {
           top: 50,
@@ -236,8 +260,14 @@ 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 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 = []
+      let data1 = []
+      this.resData.CoolingInTheKilnList.map(el => {
+        date.push(el.material_code)
+        data1.push(el.qty)
+      })
       let option = {
         grid: {
           top: 50,
@@ -423,6 +453,7 @@ export default {
 .scroll_wrap
     _wh(100%, 100%)
     border 1px solid rgba(8,205,248,0.3)
+    // background-color #070b1c
 .scroll_tab_1
   _wh(100%, 40px)
   border-bottom 1 solid rgba(8,205,248,0.3)
diff --git a/src/pages/modules/hunniankunliao/one.vue b/src/pages/modules/hunniankunliao/one.vue
index d6d61f0..ea1a6cb 100644
--- a/src/pages/modules/hunniankunliao/one.vue
+++ b/src/pages/modules/hunniankunliao/one.vue
@@ -95,11 +95,14 @@
 </template>
 
 <script>
+import { blendingCondition } from '@js/getData0'
 export default {
   name: 'one',
   data () {
     return {
-      array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料          湖南厂家 ', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
+      resData: {},
+      array1: []
+      // array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料          湖南厂家 ', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
     }
   },
   computed: {
@@ -117,8 +120,14 @@ export default {
     }
   },
   mounted () {
+    this.initData()
   },
   methods: {
+    async initData () {
+      let res = await blendingCondition()
+      this.resData = res.result
+      this.array1 = res.result.MixDayList
+    }
   }
 }
 </script>
@@ -149,7 +158,7 @@ export default {
     _fj()
 .status_wrap
     position absolute
-    top 0px
+    top 18px
     right 40px
     z-index 1
     _fj(row)
@@ -175,9 +184,10 @@ export default {
 .box1
   position relative
   _wh(100%, 58%)
+//   border 1px solid rgba(8,205,248,0.3)
+//   border-right none
 .box_l1
   _wh(6%, 18%)
-  background-color #ede
   position absolute
   top 25%
   right 30%
@@ -190,7 +200,6 @@ export default {
       _wh(100%, auto)
 .box_l2
   _wh(3%, 10%)
-  background-color #ccc
   position absolute
   top 52%
   right 31.5%
@@ -203,7 +212,6 @@ export default {
       _wh(100%, auto)
 .box_r1
   _wh(6%, 18%)
-  background-color #ff0
   position absolute
   top 15%
   right 2%
@@ -216,7 +224,6 @@ export default {
       _wh(100%, auto)
 .box_r2
   _wh(3%, 10%)
-  background-color #fc9
   position absolute
   top 65%
   right 3.5%
@@ -253,6 +260,7 @@ export default {
 .scroll_wrap
     _wh(100%, 100%)
     border 1px solid rgba(8,205,248,0.3)
+    // background-color #070b1c
 .scroll_tab_1
   _wh(100%, 40px)
   border-bottom 1 solid rgba(8,205,248,0.3)
diff --git a/src/pages/modules/hunniankunliao/two.vue b/src/pages/modules/hunniankunliao/two.vue
index 99605ce..c73a646 100644
--- a/src/pages/modules/hunniankunliao/two.vue
+++ b/src/pages/modules/hunniankunliao/two.vue
@@ -64,14 +64,14 @@
                                     <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.workorder_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
+                                                <div class="scroll-ul_1_div" :class="['c_gray', 'c_yellow', 'c_green', 'c_red'][Number(e.stand_status_color)]">{{e.point_name}}</div>
                                                 <div class="scroll-ul_1_div">{{e.bom}}</div>
                                                 <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.total_mix_frequency}}</div>
-                                                <div class="scroll-ul_1_div">{{e.order_status}}</div>
+                                                <div class="scroll-ul_1_div">{{e.weight}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.mix_num}}</div>
+                                                <div class="scroll-ul_1_div">{{e.standing_time}}</div>
+                                                <div class="scroll-ul_1_div">{{e.stand_status_name}}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -86,27 +86,27 @@
                         <div class="item_content">
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
-                                    <li>类别</li>
+                                    <li style="width: 6.5%;">类别</li>
                                     <li>BOM号</li>
                                     <li>物料名称</li>
                                     <li>重量</li>
                                     <li>载具号</li>
                                     <li>碾次</li>
                                     <li>货位</li>
-                                    <li>出入时间</li>
+                                    <li style="width: 18%;">出入时间</li>
                                 </ul>
                                 <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="array2" :class-option="defaultOption2">
                                         <ul class="scroll-ul_1">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.workorder_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
+                                            <li v-for="(e, i) in array2" :key="i">
+                                                <div class="scroll-ul_1_div" style="width: 6.5%;">{{e.io_type}}</div>
                                                 <div class="scroll-ul_1_div">{{e.bom}}</div>
                                                 <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                                                <div class="scroll-ul_1_div">{{e.total_mix_frequency}}</div>
-                                                <div class="scroll-ul_1_div">{{e.order_status}}</div>
+                                                <div class="scroll-ul_1_div">{{e.weight}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.mix_num}}</div>
+                                                <div class="scroll-ul_1_div">{{e.point_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 18%;">{{e.create_time}}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -121,11 +121,16 @@
 </template>
 
 <script>
+import { trappedMaterialCondition } from '@js/getData0'
 export default {
   name: 'one',
   data () {
     return {
-      array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
+      resData: {},
+      array1: [],
+      array2: []
+      // array1: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
+      // array2: [{workorder_code: 'hl00001', device_name: '混碾机1', bom: 'WL001', material_code: '1号混料', plan_qty: '5000', real_qty: '200', total_mix_frequency: '230505001001', order_status: '生产完成', realproducestart_date: '10-11 19:11:00', realproduceend_date: '10-11 19:11:00'}]
     }
   },
   computed: {
@@ -140,17 +145,44 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
       }
+    },
+    defaultOption2 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 11, // 开始无缝滚动的数据量 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)
+      }
     }
   },
   mounted () {
+    this.initData()
   },
   methods: {
+    async initData () {
+      let res = await trappedMaterialCondition()
+      this.resData = res.result
+      this.array1 = res.result.TrappedStockList
+      this.array2 = res.result.TrappedIOStockList
+    }
   }
 }
 </script>
 
 <style lang="stylus" scoped>
 @import '~@css/mixin'
+.c_gray
+  color $gray1 !important
+.c_yellow
+  color $yellow !important
+.c_green
+  color $green !important
+.c_red
+  color $orange !important
 .n_container
     _wh(100%, 100%)
 .n_header
@@ -175,7 +207,7 @@ export default {
     _fj()
 .status_wrap
     position absolute
-    top 0px
+    top 18px
     right 40px
     z-index 1
     _fj(row)
@@ -199,9 +231,10 @@ export default {
 .box1
   position relative
   _wh(100%, 58%)
+//   border 1px solid rgba(8,205,248,0.3)
+//   border-left none
 .box_l1
   _wh(3%, 10%)
-  background-color #ede
   position absolute
   top 25%
   right 20%
@@ -214,7 +247,6 @@ export default {
       _wh(100%, auto)
 .box_l2
   _wh(3%, 10%)
-  background-color #ccc
   position absolute
   top 65%
   right 20%
@@ -227,7 +259,6 @@ export default {
       _wh(100%, auto)
 .box_r1
   _wh(3%, 10%)
-  background-color #ff0
   position absolute
   top 25%
   right 2%
@@ -240,7 +271,6 @@ export default {
       _wh(100%, auto)
 .box_r2
   _wh(3%, 10%)
-  background-color #fc9
   position absolute
   top 65%
   right 2%
@@ -280,6 +310,7 @@ export default {
 .scroll_wrap
     _wh(100%, 100%)
     border 1px solid rgba(8,205,248,0.3)
+    // background-color #070b1c
 .scroll_tab_1
   _wh(100%, 40px)
   border-bottom 1 solid rgba(8,205,248,0.3)