diff --git a/src/pages/modules/processproduction/two.vue b/src/pages/modules/processproduction/two.vue
index ee5d7a1..ddac167 100644
--- a/src/pages/modules/processproduction/two.vue
+++ b/src/pages/modules/processproduction/two.vue
@@ -21,11 +21,11 @@
                         <div class="right_1_up_right">
                           <div class="right_1_up_right_item">
                             <p class="right_1_up_p1">当日计划生产：</p>
-                            <p class="right_1_up_p2">100<span>吨</span></p>
+                            <p class="right_1_up_p2">{{num1}}<span>吨</span></p>
                           </div>
                           <div class="right_1_up_right_item">
                             <p class="right_1_up_p1">当日实际生产：</p>
-                            <p class="right_1_up_p2">80<span>吨</span></p>
+                            <p class="right_1_up_p2">{{num2}}<span>吨</span></p>
                           </div>
                         </div>
                       </div>
@@ -103,11 +103,16 @@
 </template>
 
 <script>
+import { processProduction } from '@js/getData0'
 export default {
   name: 'two',
   data () {
     return {
-      finishRate1: 80,
+      num1: 0,
+      num2: 0,
+      num3: 0,
+      num4: 0,
+      finishRate1: 0,
       echartData03: [{data1: '5', data2: '15', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
       echartData04: [{data1: '15', data2: '15', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
       echartData05: [{data1: '19', data2: '10', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
@@ -121,14 +126,36 @@ export default {
     }
   },
   mounted () {
-    this.setEchart01()
-    this.setEchart02()
-    this.setEchart03()
-    this.setEchart04()
-    this.setEchart05()
-    this.setEchart06()
+    this.initData()
+    // this.setEchart01()
+    // this.setEchart02()
+    // this.setEchart03()
+    // this.setEchart04()
+    // this.setEchart05()
+    // this.setEchart06()
   },
   methods: {
+    async initData () {
+      let res = await processProduction()
+      this.resData = res.result
+      this.num1 = res.result.BZ.bz_plan_day
+      this.num2 = res.result.BZ.bz_real_day
+      this.num3 = res.result.KC.kc_plan_day
+      this.num4 = res.result.KC.kc_real_day
+      this.finishRate1 = res.result.BZ.bz_productivity
+      this.finishRate2 = res.result.KC.kc_productivity
+      this.echartData03 = res.result.BZ.BZDayList
+      this.echartData05 = res.result.BZ.BZWeekList
+      this.echartData04 = res.result.KC.KCDayList
+      this.echartData06 = res.result.KC.KCWeekList
+      console.log(this.echartData06, '222222')
+      this.setEchart01()
+      this.setEchart02()
+      this.setEchart03()
+      this.setEchart04()
+      this.setEchart06()
+      this.setEchart05()
+    },
     setEchart01 () {
       let value = Number(this.finishRate1)
       let title = '%'
@@ -414,15 +441,11 @@ export default {
     setEchart03 () {
       let data1 = []
       let data2 = []
-      let data3 = []
-      let data4 = []
       let device = []
       this.echartData03.map(e => {
-        data1.push(e.data1)
-        data2.push(e.data2)
-        data3.push(e.data3)
-        data4.push(e.data4)
-        device.push(e.device)
+        data1.push(e.qualified_qty)
+        data2.push(e.unqualified_qty)
+        device.push(e.device_name)
       })
       let option = {
         grid: {
@@ -552,14 +575,12 @@ export default {
       let data1 = []
       let data2 = []
       let data3 = []
-      let data4 = []
       let device = []
       this.echartData04.map(e => {
-        data1.push(e.data1)
-        data2.push(e.data2)
-        data3.push(e.data3)
-        data4.push(e.data4)
-        device.push(e.device)
+        data1.push(e.region_in_qty)
+        data2.push(e.region_out_qty)
+        data3.push(e.inventory_qty)
+        device.push(e.material_code)
       })
       let option = {
         grid: {
@@ -710,15 +731,11 @@ export default {
     setEchart05 () {
       let data1 = []
       let data2 = []
-      let data3 = []
-      let data4 = []
       let device = []
       this.echartData05.map(e => {
-        data1.push(e.data1)
-        data2.push(e.data2)
-        data3.push(e.data3)
-        data4.push(e.data4)
-        device.push(e.device)
+        data1.push(e.qualified_qty)
+        data2.push(e.unqualified_qty)
+        device.push(e.device_name)
       })
       let option = {
         grid: {
@@ -848,14 +865,12 @@ export default {
       let data1 = []
       let data2 = []
       let data3 = []
-      let data4 = []
       let device = []
       this.echartData06.map(e => {
-        data1.push(e.data1)
-        data2.push(e.data2)
-        data3.push(e.data3)
-        data4.push(e.data4)
-        device.push(e.device)
+        data1.push(e.region_in_qty)
+        data2.push(e.region_out_qty)
+        data3.push(e.inventory_qty)
+        device.push(e.material_code)
       })
       let option = {
         grid: {
diff --git a/src/router/index.js b/src/router/index.js
index ae423e6..e4503db 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ const ProdCount = r => require.ensure([], () => r(require('@page/ProdCount2')),
 Vue.use(Router)
 
 const ProcessProductionOne = r => require.ensure([], () => r(require('@page/modules/processproduction/one')), 'modules')
-const ProcessProductionTwo = r => require.ensure([], () => r(require('@page/modules/processproduction/two2')), 'modules')
+const ProcessProductionTwo = r => require.ensure([], () => r(require('@page/modules/processproduction/two')), 'modules')
 const ProcessProductionThree = r => require.ensure([], () => r(require('@page/modules/processproduction/three')), 'modules')
 
 export default new Router({