diff --git a/README.md b/README.md
index 3b254a0..d85d64f 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,5 @@ npm run build --report
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
 
-# 马钢大屏尺寸1920*1080
\ No newline at end of file
+# 马钢大屏尺寸1920*1080
+# 接口地址：https://apifox.com/apidoc/shared-502f730f-87a1-45eb-a8ec-786fd1ac8602
\ No newline at end of file
diff --git a/package.json b/package.json
index 8ec84e6..c16e090 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
+    "default-passive-events": "^2.0.0",
     "echarts": "^5.3.2",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index a48db6d..1d0d331 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -1,126 +1,3 @@
-import {post, post1} from '@js/http.js'
+import {post} from '@js/http.js'
 
-/** 1.1配粉设备下拉框 */
-export const queryDevice = (url) => post1(url + '/api/screen/pdm/queryDevice', {})
-
-/** 1.1大屏左一 */
-// export const planReached = (id) => post('api/bigscreen/product/planReached', {})
-export const planReached = (id) => {
-  let res = {
-    code: '1',
-    dayResult: {
-      jo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
-      jo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
-      jo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'}
-    },
-    monthResult: {
-      joo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
-      joo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
-      joo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'}
-    }
-  }
-  return res
-}
-
-/** 1.2大屏左二 */
-// export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {})
-export const worksectionHarvest = (id) => {
-  let res = {
-    code: '1',
-    result: [
-      {
-        'device_name': '运行',
-        'failure': 0,
-        'shutdown': 0,
-        'standby': 0,
-        'running': 5
-      },
-      {
-        'device_name': '暂停',
-        'failure': 0,
-        'shutdown': 0,
-        'standby': 1,
-        'running': 0
-      },
-      {
-        'device_name': '停机',
-        'failure': 0,
-        'shutdown': 2,
-        'standby': 0,
-        'running': 0
-      },
-      {
-        'device_name': '故障',
-        'failure': 1,
-        'shutdown': 0,
-        'standby': 0,
-        'running': 0
-      }
-    ]
-  }
-  return res
-}
-
-/** 1.3大屏左三 */
-// export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {})
-export const monthHarvest = (id) => {
-  let res = {
-    code: '1',
-    result: [{date: '混料', real_qty: '10', rate: '10'}, {date: '压制', real_qty: '8', rate: '15'}, {date: '干燥', real_qty: '3', rate: '2'}, {date: '分拣', real_qty: '7', rate: '5'}]
-  }
-  return res
-}
-
-/** 1.4大屏右一 */
-// export const output = (id) => post('api/bigscreen/product/output', {})
-export const output = (id) => {
-  let res = {
-    code: '1',
-    result: {finish_rate: '80', plan_qty: '10', real_qty: '20', sum_qty: '100', normal_qty: '20', delayed_qty: '10'}
-  }
-  return res
-}
-
-/** 1.5大屏右二 */
-// export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {})
-export const topHarvest = (id) => {
-  let res = {
-    code: '1',
-    result: [{sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}]
-  }
-  return res
-}
-
-/** 1.6大屏右三 */
-// export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {})
-export const monthOrder = (id) => {
-  let res = {
-    code: '1',
-    result: [{material_spec: '1', real_qty: '10'}]
-  }
-  return res
-}
-
-/** 1.7大屏中一 */
-// export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {})
-export const productSchedule = (id) => {
-  let res = {
-    code: '1',
-    result: [{a1: 'hn01', a2: 'wl01', a3: '1号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}]
-  }
-  return res
-}
-
-/** 1.8大屏中二 */
-export const unfinishOrder = (id) => post('api/bigscreen/product/unfinishOrder', {})
-
-// 车间看板
-// 1.1任务数
-export const getTask = (id) => post('api/agvBigScreen/getTask', {})
-// 1.2车辆状态
-export const getAgvMsg = (id) => post('api/agvBigScreen/getAgvMsg', {})
-
-/** 大屏首页报表 */
-export const homepageData = () => post('api/dashboard/homepageData', {})
-/** 大屏首页设备 */
-export const homepageEquipment = () => post('api/dashboard/homepageEquipment', {})
+export const vpress = (url) => post('api/cockpit/v2/press', {})
diff --git a/src/assets/js/mork2.js b/src/assets/js/mork2.js
index 8c4574b..9d5d6a8 100644
--- a/src/assets/js/mork2.js
+++ b/src/assets/js/mork2.js
@@ -1,908 +1,479 @@
-export const homepageData = () => {
+/* eslint-disable */
+export const vpress = () => {
   let res = {
-    'currentEquipmentCondition': {
-      'running': 10,
-      'pausing': 4,
-      'shutdown': 1,
-      'inTrouble': 1
+    DataInfo: {
+        dataInfo: [
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '263532'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '263568'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '816.00',
+                down_time: '2024-01-11 15:10:36',
+                minutes_difference: '263569'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:39:37',
+                minutes_difference: '263600'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '816.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '263624'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '263627'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '818.00',
+                down_time: '2024-01-10 21:40:24',
+                minutes_difference: '263657'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '263690'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 15:36:29',
+                minutes_difference: '263706'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 16:07:28',
+                minutes_difference: '263707'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '817.00',
+                down_time: '2024-01-11 14:20:58',
+                minutes_difference: '263788'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '263794'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '263794'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 15:10:36',
+                minutes_difference: '263835'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '263876'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '820.00',
+                down_time: '2024-01-10 20:40:12',
+                minutes_difference: '263907'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 14:39:37',
+                minutes_difference: '263922'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '263923'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 15:36:29',
+                minutes_difference: '263961'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '263962'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: 'RH环流管衬砖',
+                material_weight: '817.00',
+                down_time: '2024-01-11 14:20:58',
+                minutes_difference: '263983'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 16:07:28',
+                minutes_difference: '264011'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '264012'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 15:10:36',
+                minutes_difference: '264065'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '264076'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 15:36:29',
+                minutes_difference: '264106'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '819.00',
+                down_time: '2024-01-10 20:40:12',
+                minutes_difference: '264108'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 14:39:37',
+                minutes_difference: '264131'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '264135'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '264144'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 15:36:29',
+                minutes_difference: '264160'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:20:58',
+                minutes_difference: '264168'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '264180'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '822.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '264219'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '819.00',
+                down_time: '2024-01-10 20:40:12',
+                minutes_difference: '264231'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '264252'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '264257'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 14:39:37',
+                minutes_difference: '264291'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 16:07:28',
+                minutes_difference: '264296'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 15:10:36',
+                minutes_difference: '264300'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 15:36:29',
+                minutes_difference: '264300'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '821.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '264322'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '264325'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 14:20:58',
+                minutes_difference: '264336'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '821.00',
+                down_time: '2024-01-10 20:40:12',
+                minutes_difference: '264356'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: 'RH环流管衬砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 16:06:27',
+                minutes_difference: '264358'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '817.00',
+                down_time: '2024-01-11 12:03:49',
+                minutes_difference: '264366'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '821.00',
+                down_time: '2024-01-11 16:47:33',
+                minutes_difference: '264390'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '下部槽砖',
+                material_weight: '817.00',
+                down_time: '2024-01-11 15:10:36',
+                minutes_difference: '264392'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '818.00',
+                down_time: '2024-01-11 14:13:02',
+                minutes_difference: '264395'
+            },
+            {
+                redundance_material_code: '140703000036',
+                material_name: 'RH下部槽工作层砖',
+                material_weight: '819.00',
+                down_time: '2024-01-11 08:19:25',
+                minutes_difference: '264419'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: '环流管砖',
+                material_weight: '820.00',
+                down_time: '2024-01-11 16:07:28',
+                minutes_difference: '264447'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '环流管砖',
+                material_weight: '822.00',
+                down_time: '2024-01-11 14:39:37',
+                minutes_difference: '264448'
+            },
+            {
+                redundance_material_code: '140703000037',
+                material_name: '整体管上层砖',
+                material_weight: '821.00',
+                down_time: '2024-01-11 14:20:58',
+                minutes_difference: '264480'
+            },
+            {
+                redundance_material_code: '140703000034',
+                material_name: 'RH环流管衬砖',
+                material_weight: '820.00',
+                down_time: '2024-01-10 20:40:12',
+                minutes_difference: '264481'
+            }
+        ],
+        count: 55,
+        sum: 45047
     },
-    'monthlyFailureStatistics': {
-      'currentMonth': {
-        'mix': 12,
-        'press': 8,
-        'dry': 4,
-        'sort': 2
-      },
-      'average': {
-        'mix': 16,
-        'press': 10,
-        'dry': 6,
-        'sort': 1
-      }
+    PlanInfo: {
+        planMonthSum: 387898,
+        dayPlanSum: 44220,
+        realMonthSum: 323399,
+        dayPassRate: 55.36770921386306,
+        montPassRate: 56.04132617324306,
+        dayRealSum: 48327
     },
-    'dailyProductionStatistics': {
-      'mix': {
-        'planned': 64.25,
-        'completed': 32.25
-      },
-      'stand': {
-        'onStanding': 32.25,
-        'completed': 16.25
-      },
-      'press': {
-        'planned': 64.25,
-        'completed': 32.25
-      },
-      'dry': {
-        'planned': 64.25,
-        'completed': 32.25
-      },
-      'sort': {
-        'planned': 32.25,
-        'completed': 16.25
-      }
+    PressInfo: [
+    {
+      point_code: 'YJ01',
+      point_status: '01',
+      material_code: '-',
+      raw_material_code: '-',
+      team_qty: '0',
+      blj_weight: null,
+      rate: '0'
     },
-    'equipmentProductionStatistics': [
-      {
-        'equipment': 'HLJ01',
-        'materialCode': 'WL01',
-        'materialName': '物料1',
-        'completed': 64.25
-      },
-      {
-        'equipment': 'HLJ02',
-        'materialCode': 'WL02',
-        'materialName': '物料2',
-        'completed': 32.25
-      },
-      {
-        'equipment': 'HLJ03',
-        'materialCode': 'WL03',
-        'materialName': '物料3',
-        'completed': 16.25
-      },
-      {
-        'equipment': 'HLJ04',
-        'materialCode': 'WL04',
-        'materialName': '物料1',
-        'completed': 64.25
-      },
-      {
-        'equipment': 'HLJ05',
-        'materialCode': 'WL05',
-        'materialName': '物料2',
-        'completed': 32.25
-      },
-      {
-        'equipment': 'HLJ06',
-        'materialCode': 'WL06',
-        'materialName': '物料3',
-        'completed': 16.25
-      },
-      {
-        'equipment': 'HLJ07',
-        'materialCode': 'WL07',
-        'materialName': '物料1',
-        'completed': 64.25
-      },
-      {
-        'equipment': 'HLJ08',
-        'materialCode': 'WL08',
-        'materialName': '物料2',
-        'completed': 32.25
-      },
-      {
-        'equipment': 'HLJ09',
-        'materialCode': 'WL09',
-        'materialName': '物料3',
-        'completed': 16.25
+    {
+      point_code: 'YJ02',
+      point_status: null,
+      material_code: '21B-B1-5K1',
+      raw_material_code: '140703000034',
+      team_qty: '213',
+      blj_weight: null,
+      rate: '57.8652'
+    },
+    {
+      point_code: 'YJ03',
+      point_status: null,
+      material_code: '21B-C1-1',
+      raw_material_code: '140703000034',
+      team_qty: '0',
+      blj_weight: null,
+      rate: '0'
+    },
+    {
+      point_code: 'YJ04',
+      point_status: null,
+      material_code: '-',
+      raw_material_code: '-',
+      team_qty: '0',
+      blj_weight: null,
+      rate: '0'
+    },
+    {
+      point_code: 'YJ05',
+      point_status: null,
+      material_code: 'TG-15RH-01',
+      raw_material_code: '140703000043',
+      team_qty: '217',
+      blj_weight: null,
+      rate: '51.0638'
+    },
+    {
+      point_code: 'YJ06',
+      point_status: null,
+      material_code: '-',
+      raw_material_code: '-',
+      team_qty: '0',
+      blj_weight: null,
+      rate: '0'
+    },
+    {
+      point_code: 'YJ07',
+      point_status: null,
+      material_code: '34R-03',
+      raw_material_code: '140703000037',
+      team_qty: '408',
+      blj_weight: null,
+      rate: '44.2260'
+    },
+    {
+      point_code: 'YJ08',
+      point_status: null,
+      material_code: '33C-XM-06a',
+      raw_material_code: '140703000034',
+      team_qty: '338',
+      blj_weight: null,
+      rate: '59.3472'
       }
     ]
   }
   return res
 }
-
-export const homepageEquipment = () => {
-  let res = {
-    'backWarehouse': {
-      'storageLocation': [
-        {
-          'equipment': '窑后货位1',
-          'pointStatus': '3',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位2',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位3',
-          'pointStatus': '3',
-          'status': '3'
-        },
-        {
-          'equipment': '窑后货位4',
-          'pointStatus': '1',
-          'status': '2'
-        },
-        {
-          'equipment': '窑后货位5',
-          'pointStatus': '1',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位6',
-          'pointStatus': '2',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位7',
-          'pointStatus': '2',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位8',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑后货位9',
-          'pointStatus': '2',
-          'status': '3'
-        },
-        {
-          'equipment': '窑后货位10',
-          'pointStatus': '1',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位11',
-          'pointStatus': '2',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位12',
-          'pointStatus': '1',
-          'status': '2'
-        },
-        {
-          'equipment': '窑后货位13',
-          'pointStatus': '3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位14',
-          'pointStatus': '2',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位15',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑后货位16',
-          'pointStatus': '3',
-          'status': '3'
-        },
-        {
-          'equipment': '窑后货位17',
-          'pointStatus': '3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位18',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位19',
-          'pointStatus': '2',
-          'status': '1'
-        },
-        {
-          'equipment': '窑后货位20',
-          'pointStatus': '3',
-          'status': '3'
-        },
-        {
-          'equipment': '窑后货位21',
-          'pointStatus': '3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后货位22',
-          'pointStatus': '1',
-          'status': '3'
-        },
-        {
-          'equipment': '窑后货位23',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑后货位24',
-          'pointStatus': '1',
-          'status': '4'
-        }
-      ]
-    },
-    'frontWarehouse': {
-      'storageLocation': [
-        {
-          'equipment': '窑前货位1',
-          'pointStatus': '3',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位3',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位5',
-          'pointStatus': '3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑前货位7',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位9',
-          'pointStatus': '2',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位11',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前货位13',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前货位15',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位17',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位19',
-          'pointStatus': '2',
-          'status': '4'
-        },
-        {
-          'equipment': '窑前货位21',
-          'pointStatus': '3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑前货位23',
-          'pointStatus': '2',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位25',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位27',
-          'pointStatus': '2',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前货位2',
-          'pointStatus': '1',
-          'status': '4'
-        },
-        {
-          'equipment': '窑前货位4',
-          'pointStatus': '1',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位6',
-          'pointStatus': '3',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前货位8',
-          'pointStatus': '1',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位10',
-          'pointStatus': '3',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位12',
-          'pointStatus': '1',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位14',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位16',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前货位18',
-          'pointStatus': '1',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位20',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位22',
-          'pointStatus': '1',
-          'status': '3'
-        },
-        {
-          'equipment': '窑前货位24',
-          'pointStatus': '3',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位26',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前货位28',
-          'pointStatus': '1',
-          'status': '3'
-        }
-      ]
-    },
-    'vehicleConveyorLine': {
-      'trayStacker': [
-        {
-          'equipment': '叠托机1',
-          'status': '3'
-        }
-      ],
-      'conveyorLine': [
-        {
-          'equipment': '拆盘机1对接位5',
-          'status': '2'
-        }
-      ],
-      'trayDestacker': [
-        {
-          'equipment': '拆盘机1',
-          'status': '4'
-        }
-      ]
-    },
-    'dry': {
-      'kiln': [
-        {
-          'equipment': '窑1',
-          'status': '3'
-        },
-        {
-          'equipment': '窑2',
-          'status': '3'
-        },
-        {
-          'equipment': '窑3',
-          'status': '4'
-        }
-      ],
-      'gantryRobot': [
-        {
-          'equipment': '窑前桁架1',
-          'status': '4'
-        },
-        {
-          'equipment': '窑后桁架1',
-          'status': '1'
-        }
-      ],
-      'emptyVehicleConveyorLine': [
-        {
-          'equipment': '回车道1',
-          'status': '2'
-        }
-      ],
-      'conveyorLine': [
-        {
-          'equipment': '窑前输送线1',
-          'status': '2'
-        },
-        {
-          'equipment': '窑前输送线2',
-          'status': '1'
-        },
-        {
-          'equipment': '窑前输送线3',
-          'status': '4'
-        },
-        {
-          'equipment': '窑前输送线4',
-          'status': '3'
-        }
-      ],
-      'coolingConveyorLine': [
-        {
-          'equipment': '冷却道1',
-          'status': '1'
-        },
-        {
-          'equipment': '冷却道2',
-          'status': '2'
-        },
-        {
-          'equipment': '冷却道3',
-          'status': '4'
-        },
-        {
-          'equipment': '冷却道4',
-          'status': '3'
-        }
-      ]
-    },
-    'sort': {
-      'palletizingRobot': [
-        {
-          'equipment': '分拣码垛机械手1',
-          'status': '1'
-        }
-      ],
-      'unloadLocation': [
-        {
-          'equipment': '分拣码垛1对接位1',
-          'status': '2'
-        },
-        {
-          'equipment': '分拣码垛1对接位2',
-          'status': '3'
-        }
-      ],
-      'depalletizingRobot': [
-        {
-          'equipment': '分拣拆垛机械手1',
-          'status': '1'
-        }
-      ],
-      'loadLocation': [
-        {
-          'equipment': '分拣拆垛1对接位1',
-          'status': '4'
-        },
-        {
-          'equipment': '分拣拆垛1对接位2',
-          'status': '2'
-        }
-      ],
-      'laminatingMachine': [
-        {
-          'equipment': '覆膜机1',
-          'status': '1'
-        }
-      ]
-    },
-    'stand': {
-      'storageLocation': [
-        {
-          'equipment': '困料货位1',
-          'pointStatus': '3',
-          'standStatus': '4',
-          'status': '3'
-        },
-        {
-          'equipment': '困料货位2',
-          'pointStatus': '1',
-          'status': '2'
-        },
-        {
-          'equipment': '困料货位3',
-          'pointStatus': '2',
-          'status': '2'
-        },
-        {
-          'equipment': '困料货位4',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '困料货位5',
-          'pointStatus': '1',
-          'status': '1'
-        },
-        {
-          'equipment': '困料货位6',
-          'pointStatus': '2',
-          'status': '1'
-        },
-        {
-          'equipment': '困料货位7',
-          'pointStatus': '3',
-          'standStatus': '4',
-          'status': '3'
-        },
-        {
-          'equipment': '困料货位8',
-          'pointStatus': '3',
-          'standStatus': '1',
-          'status': '3'
-        }
-      ]
-    },
-    'press': {
-      'palletizingRobot': [
-        {
-          'equipment': '码垛机械手1',
-          'status': '3'
-        },
-        {
-          'equipment': '码垛机械手2',
-          'status': '4'
-        },
-        {
-          'equipment': '码垛机械手3',
-          'status': '1'
-        },
-        {
-          'equipment': '码垛机械手4',
-          'status': '4'
-        },
-        {
-          'equipment': '码垛机械手5',
-          'status': '1'
-        },
-        {
-          'equipment': '码垛机械手6',
-          'status': '1'
-        }
-      ],
-      'unloadLocation': [
-        {
-          'equipment': '压机1下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机1下料位2',
-          'status': '3'
-        },
-        {
-          'equipment': '压机2下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机2下料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机3下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机3下料位2',
-          'status': '4'
-        },
-        {
-          'equipment': '压机4下料位1',
-          'status': '2'
-        },
-        {
-          'equipment': '压机4下料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机5下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机5下料位2',
-          'status': '4'
-        },
-        {
-          'equipment': '压机6下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机6下料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机7下料位1',
-          'status': '3'
-        },
-        {
-          'equipment': '压机7下料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机8下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机8下料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9下料位2',
-          'status': '3'
-        }
-      ],
-      'pressMachine': [
-        {
-          'equipment': '压机1',
-          'status': '3'
-        },
-        {
-          'equipment': '压机2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机3',
-          'status': '1'
-        },
-        {
-          'equipment': '压机4',
-          'status': '2'
-        },
-        {
-          'equipment': '压机5',
-          'status': '2'
-        },
-        {
-          'equipment': '压机6',
-          'status': '3'
-        },
-        {
-          'equipment': '压机7',
-          'status': '4'
-        },
-        {
-          'equipment': '压机8',
-          'status': '3'
-        },
-        {
-          'equipment': '压机9',
-          'status': '4'
-        }
-      ],
-      'loadLocation': [
-        {
-          'equipment': '压机1上料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机2上料位1',
-          'status': '2'
-        },
-        {
-          'equipment': '压机3上料位1',
-          'status': '3'
-        },
-        {
-          'equipment': '压机4上料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机5上料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机6上料位1',
-          'status': '3'
-        },
-        {
-          'equipment': '压机7上料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机7上料位2',
-          'status': '4'
-        },
-        {
-          'equipment': '压机7上料位3',
-          'status': '4'
-        },
-        {
-          'equipment': '压机7上料位4',
-          'status': '4'
-        },
-        {
-          'equipment': '压机8上料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '压机8上料位2',
-          'status': '4'
-        },
-        {
-          'equipment': '压机9上料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位2',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位3',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位4',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位5',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位6',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位7',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位8',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位9',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位10',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位11',
-          'status': '1'
-        },
-        {
-          'equipment': '压机9上料位12',
-          'status': '1'
-        }
-      ]
-    },
-    'mix': {
-      'mixingMachine': [
-        {
-          'equipment': '混料机1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机2',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机3',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机4',
-          'status': '3'
-        },
-        {
-          'equipment': '混料机5',
-          'status': '2'
-        },
-        {
-          'equipment': '混料机6',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机7',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机8',
-          'status': '2'
-        },
-        {
-          'equipment': '混料机9',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机10',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机11',
-          'status': '3'
-        },
-        {
-          'equipment': '混料机12',
-          'status': '3'
-        },
-        {
-          'equipment': '混料机13',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机14',
-          'status': '1'
-        }
-      ],
-      'unloadLocation': [
-        {
-          'equipment': '混料机1下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机2下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机3下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机4下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机5下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机6下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机7下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机8下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机9下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机10下料位1',
-          'status': '3'
-        },
-        {
-          'equipment': '混料机11下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机12下料位1',
-          'status': '4'
-        },
-        {
-          'equipment': '混料机13下料位1',
-          'status': '1'
-        },
-        {
-          'equipment': '混料机14下料位1',
-          'status': '1'
-        }
-      ]
-    }
-  }
-  return res
-}
diff --git a/src/main.js b/src/main.js
index 232f7f8..8f512da 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,7 @@ import '@css/layout2.styl'
 import filter from '@js/filter.js'
 import { Dialog, toast } from '@js/mUtils.js'
 import {post} from '@js/http.js'
+import 'default-passive-events'
 import * as echarts from 'echarts'
 import VueParticles from 'vue-particles'
 import scroll from 'vue-seamless-scroll'
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index 4a52dad..f09bc35 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -94,7 +94,7 @@ export default {
         // equipId: this.active
       }
       this.$store.dispatch('setConfig', obj)
-      this.$router.push('/prodcount')
+      this.$router.push('/board')
       let element = document.documentElement
       if (this.fullscreen) {
         if (document.exitFullscreen) {
diff --git a/src/pages/board.vue b/src/pages/board.vue
index 7e10755..eed1946 100644
--- a/src/pages/board.vue
+++ b/src/pages/board.vue
@@ -3,36 +3,32 @@
     <t-header  title="压制生产看板"></t-header>
     <div class="content">
       <div class="zd-row yj_wraper">
-        <div class="yj_item" v-for="(e, i) in dataList1" :key="'yj' + i">
-          <div class="zd-row jccenter yj_name">{{ e.device_code }}</div>
+        <div class="yj_item" v-for="(e, i) in PressInfo" :key="'yj' + i">
+          <div class="zd-row jccenter yj_name">{{ e.point_code }}</div>
           <div class="yj_info_wraper">
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">压机状态:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.point_status }}</div>
+              <div class="yj_info_p2">压机状态</div>
             </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">当前产品:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.material_code }}</div>
+              <div class="yj_info_p2">当前产品</div>
             </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">泥料:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.raw_material_code }}</div>
+              <div class="yj_info_p2">泥料</div>
             </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">当班产量:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.team_qty }}</div>
+              <div class="yj_info_p2">当班产量</div>
             </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">布料仓余量:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.blj_weight }}</div>
+              <div class="yj_info_p2">布料仓余量</div>
             </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">缓存线泥料余量:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
-            </div>
-            <div class="zd-row yj_info">
-              <div class="yj_info_p2">当班合格率:</div>
-              <div class="yj_info_p1">{{ e.status }}</div>
+            <div class="zd-row flexcol jccenter yj_info">
+              <div class="yj_info_p1">{{ e.rate }}</div>
+              <div class="yj_info_p2">当班合格率</div>
             </div>
           </div>
         </div>
@@ -50,11 +46,11 @@
               <div class="zd-row num_content">
                 <div class="zd-row flexcol  jccenter num_item">
                   <div class="yj_info_p2">日计划量</div>
-                  <div class="yj_info_p1">1000&nbsp;吨</div>
+                  <div class="yj_info_p1">{{PlanInfo.dayPlanSum}}&nbsp;吨</div>
                 </div>
                 <div class="zd-row flexcol  jccenter num_item">
                   <div class="yj_info_p2">日完成量</div>
-                  <div class="yj_info_p1">1000&nbsp;吨</div>
+                  <div class="yj_info_p1">{{PlanInfo.dayRealSum}}&nbsp;吨</div>
                 </div>
               </div>
             </div>
@@ -65,22 +61,22 @@
               <div class="zd-row num_content">
                 <div class="zd-row flexcol  jccenter num_item">
                   <div class="yj_info_p2">月计划量</div>
-                  <div class="yj_info_p1">1000&nbsp;吨</div>
+                  <div class="yj_info_p1">{{PlanInfo.planMonthSum}}&nbsp;吨</div>
                 </div>
                 <div class="zd-row flexcol  jccenter num_item">
                   <div class="yj_info_p2">月完成量</div>
-                  <div class="yj_info_p1">1000&nbsp;吨</div>
+                  <div class="yj_info_p1">{{PlanInfo.realMonthSum}}&nbsp;吨</div>
                 </div>
               </div>
             </div>
             <div class="zd-row num_wrap_2">
               <div class="zd-row pass_item">
                 <p class="pass_p1">日合格率</p>
-                <p class="pass_p2">20%</p>
+                <p class="pass_p2">{{PlanInfo.dayPassRate.toFixed(2)}}%</p>
               </div>
               <div class="zd-row pass_item">
-                <p class="pass_p1">日合格率</p>
-                <p class="pass_p2">20%</p>
+                <p class="pass_p1">月合格率</p>
+                <p class="pass_p2">{{PlanInfo.montPassRate.toFixed(2)}}%</p>
               </div>
             </div>
           </div>
@@ -92,12 +88,12 @@
           <div class="item_wrap">
             <div class="zd-row nl_wrap">
               <div class="zd-row cur_nl_wrap">
-                <div class="yj_info_p2">当前缓存线泥料种类</div>
-                <div class="yj_info_p1">20</div>
+                <div class="yj_info_p4">当前缓存线泥料种类</div>
+                <div class="yj_info_p3">{{ DataInfo.count }}</div>
               </div>
               <div class="zd-row cur_nl_wrap cur_nl_wrap_1">
-                <div class="yj_info_p2">当前缓存线泥料总重</div>
-                <div class="yj_info_p1">20</div>
+                <div class="yj_info_p4">当前缓存线泥料总重</div>
+                <div class="yj_info_p3">{{ DataInfo.sum }}</div>
               </div>
             </div>
             <div class="data_wrap">
@@ -110,15 +106,15 @@
                 <li>停留时间</li>
               </ul>
               <div class="scroll_container">
-                <vue-seamless-scroll :data="dataList2" :class-option="defaultOption1">
+                <vue-seamless-scroll :data="dataList" :class-option="defaultOption1">
                   <ul class="scroll-ul">
-                    <li v-for="(e, i) in dataList2" :key="i">
+                    <li v-for="(e, i) in dataList" :key="i">
                     <div class="zd-row jccenter scroll-item">{{i+1}}</div>
-                    <div class="zd-row jccenter scroll-item">{{e.material_code}}</div>
+                    <div class="zd-row jccenter scroll-item">{{e.redundance_material_code}}</div>
                     <div class="zd-row jccenter scroll-item">{{e.material_name}}</div>
-                    <div class="zd-row jccenter scroll-item">{{e.qty}}</div>
-                    <div class="zd-row jccenter scroll-item">{{e.time}}</div>
-                    <div class="zd-row jccenter scroll-item">{{e.time1}}</div>
+                    <div class="zd-row jccenter scroll-item">{{e.material_weight}}</div>
+                    <div class="zd-row jccenter scroll-item">{{e.down_time}}</div>
+                    <div class="zd-row jccenter scroll-item">{{e.minutes_difference}}</div>
                     </li>
                   </ul>
                 </vue-seamless-scroll>
@@ -134,14 +130,20 @@
 
 <script>
 import THeader from '@components/header.vue'
+import { vpress } from '@js/getData2'
+// import { vpress } from '@js/mork2'
 export default {
   components: {
     THeader
   },
   data () {
     return {
-      dataList1: [],
-      dataList2: [{material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}, {material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}, {material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}, {material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}, {material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}, {material_code: 'jdjlfjlfj', material_name: '砥砺奋进浪费就', time: '2020-10-10', time1: '2020-10-10', qty: '100'}]
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      PressInfo: [], // 压机数据
+      PlanInfo: {planMonthSum: 0, dayPlanSum: 0, realMonthSum: 0, dayPassRate: 0, montPassRate: 0, dayRealSum: 0}, // 合格数
+      DataInfo: {}, // 泥料数据
+      dataList: []
     }
   },
   computed: {
@@ -158,17 +160,32 @@ export default {
       }
     }
   },
-  created () {
-    for (let i = 0; i < 8; i++) {
-      this.dataList1.push({device_code: `${i + 1}号压机`, status: '开机'})
-    }
-  },
   mounted () {
-    this.setEchart1()
+    this.initData()
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
   },
   methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this.initData()
+      }, this.interTime)
+    },
+    async initData () {
+      let res = await vpress()
+      this.PressInfo = [...res.PressInfo]
+      this.PlanInfo = res.PlanInfo
+      this.DataInfo = res.DataInfo
+      this.dataList = [...res.DataInfo.dataInfo]
+      this.setEchart1()
+      this.setEchart2()
+    },
     setEchart1 () {
-      let value = 10
+      let value = (this.PlanInfo.dayRealSum / this.PlanInfo.dayPlanSum) * 100
+      value = value.toFixed(2)
+      console.log(value)
       let title = '%'
       let text = '完成率'
       let option = {
@@ -180,24 +197,24 @@ export default {
             textStyle: {
               rich: {
                 a: {
-                  fontSize: 22,
+                  fontSize: 16,
                   color: '#00D9FF',
                   fontFamily: 'SourceHanSansCN',
                   foontWeight: '700'
                 },
                 b: {
-                  fontSize: 14,
+                  fontSize: 12,
                   color: '#ffffff',
                   fontFamily: 'SourceHanSansCN',
                   foontWeight: '700',
-                  padding: [10, 0, 0, 3]
+                  padding: [4, 0, 0, 2]
                 },
                 c: {
                   color: '#FFFFFF',
                   fontSize: 12,
                   fontWeight: '700',
                   fontFamily: 'SourceHanSansCN',
-                  padding: [10, 0, 0, 0]
+                  padding: [4, 0, 0, 0]
                 }
               }
             }
@@ -235,9 +252,7 @@ export default {
             data: [value],
             coordinateSystem: 'polar',
             itemStyle: {
-              normal: {
-                color: '#00dfff'
-              }
+              color: '#00dfff'
             }
           }
         ]
@@ -251,6 +266,91 @@ export default {
       window.addEventListener('resize', () => {
         echart.resize()
       })
+    },
+    setEchart2 () {
+      let value = (this.PlanInfo.realMonthSum / this.PlanInfo.planMonthSum) * 100
+      value = value.toFixed(2)
+      console.log(value)
+      let title = '%'
+      let text = '完成率'
+      let option = {
+        title: [
+          {
+            text: '{a|' + value + '}{b|' + title + '}\n{c|' + text + '}',
+            x: 'center',
+            y: 'center',
+            textStyle: {
+              rich: {
+                a: {
+                  fontSize: 16,
+                  color: '#00D9FF',
+                  fontFamily: 'SourceHanSansCN',
+                  foontWeight: '700'
+                },
+                b: {
+                  fontSize: 12,
+                  color: '#ffffff',
+                  fontFamily: 'SourceHanSansCN',
+                  foontWeight: '700',
+                  padding: [4, 0, 0, 2]
+                },
+                c: {
+                  color: '#FFFFFF',
+                  fontSize: 12,
+                  fontWeight: '700',
+                  fontFamily: 'SourceHanSansCN',
+                  padding: [4, 0, 0, 0]
+                }
+              }
+            }
+          }
+        ],
+        polar: {
+          radius: ['85%', '100%'],
+          center: ['50%', '50%']
+        },
+        angleAxis: {
+          max: 100,
+          show: false
+        },
+        radiusAxis: {
+          type: 'category',
+          show: true,
+          axisLabel: {
+            show: false
+          },
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          }
+        },
+        series: [
+          {name: '',
+            type: 'bar',
+            roundCap: true,
+            showBackground: true,
+            backgroundStyle: {
+              color: '#0a2543'
+            },
+            data: [value],
+            coordinateSystem: 'polar',
+            itemStyle: {
+              color: '#00dfff'
+            }
+          }
+        ]
+      }
+      if (document.getElementById('echart_d2') == null) {
+        return
+      }
+      this.$echarts.dispose(document.getElementById('echart_d2'))
+      let echart = this.$echarts.init(document.getElementById('echart_d2'))
+      echart.setOption(option)
+      window.addEventListener('resize', () => {
+        echart.resize()
+      })
     }
   }
 }
@@ -294,22 +394,41 @@ footer
   height calc(100% - .45rem)
   padding .1rem
 .yj_info
-  height calc(100% / 7)
+  height calc(100% / 6)
   background center bottom / 100% 3px url(../assets/images/screen1/line_1.png) no-repeat
 .yj_info_p1
+  width 100%
   font-size: .18rem;
   line-height: .18rem;
   color: #FFFFFF;
   letter-spacing: 1.88px;
   text-align: center;
   font-weight: 700;
+  margin-bottom: 8px;
 .yj_info_p2
+  width 100%
   font-size: .14rem
   line-height: .14rem
   color: #84B0DA;
   letter-spacing: 2px;
   text-align: center;
   font-weight: 700;
+.yj_info_p3
+  width 100%
+  font-size: .22rem;
+  line-height: .22rem;
+  color: #FFFFFF;
+  letter-spacing: 1.88px;
+  text-align: right;
+  font-weight: 700;
+.yj_info_p4
+  width 100%
+  font-size: .18rem
+  line-height: .18rem
+  color: #fff;
+  letter-spacing: 2px;
+  text-align: left;
+  font-weight: 700;
 .num_wraper
   width 100%
   height 45%
diff --git a/yarn.lock b/yarn.lock
index 8e0e817..9d0082d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2107,6 +2107,11 @@ deep-is@~0.1.3:
   resolved "http://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+default-passive-events@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-passive-events/-/default-passive-events-2.0.0.tgz#79b1aa67becbaab38b718469b5480fef92eda649"
+  integrity sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ==
+
 define-properties@^1.1.2:
   version "1.1.3"
   resolved "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"