diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index e4c499f..e0e13bf 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -10,5 +10,776 @@ export const deviceMonitor = () => post('api/cockpit/deviceMonitor', {
 export const findDeviceById = (id) => post('api/cockpit/findDeviceById', {
   id: id
 })
-// 车间情况
-export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
+// 首页车间情况
+// export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
+export const workshopCondition = () => {
+  let res = {
+    'code': 200,
+    'desc': '操作成功',
+    'result': {
+      'HLDayList': [
+        {
+          'plan_qty': 103000,
+          'real_qty': 46500,
+          'qualified_qty': 22500,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ01',
+          'material_code': null,
+          'device_name': '混料机1',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 103000,
+          'real_qty': 49500,
+          'qualified_qty': 25500,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ02',
+          'material_code': null,
+          'device_name': '混料机2',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 49000,
+          'real_qty': 24500,
+          'qualified_qty': 19500,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ03',
+          'material_code': null,
+          'device_name': '混料机3',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 58000,
+          'real_qty': 38000,
+          'qualified_qty': 24000,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ04',
+          'material_code': null,
+          'device_name': '混料机4',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 5000,
+          'real_qty': 3000,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ05',
+          'material_code': null,
+          'device_name': '混料机5',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ06',
+          'material_code': null,
+          'device_name': '混料机6',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 65080,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ07',
+          'material_code': null,
+          'device_name': '混料机7',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ08',
+          'material_code': null,
+          'device_name': '混料机8',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ09',
+          'material_code': null,
+          'device_name': '混料机9',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ10',
+          'material_code': null,
+          'device_name': '混料机10',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ11',
+          'material_code': null,
+          'device_name': '混料机11',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ12',
+          'material_code': null,
+          'device_name': '混料机12',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 14500,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ13',
+          'material_code': null,
+          'device_name': '混料机13',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ14',
+          'material_code': null,
+          'device_name': '混料机14',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ15',
+          'material_code': null,
+          'device_name': '混料机15',
+          'region_code': 'HL'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'HLJ16',
+          'material_code': null,
+          'device_name': '混料机16',
+          'region_code': 'HL'
+        }
+      ],
+      'DeviceConditionList': [
+        {
+          'device_name': '混料',
+          'failure': 5,
+          'shutdown': 2,
+          'standby': 6,
+          'running': 3
+        },
+        {
+          'device_name': '压制',
+          'failure': 5,
+          'shutdown': 2,
+          'standby': 6,
+          'running': 3
+        },
+        {
+          'device_name': '干燥',
+          'failure': 5,
+          'shutdown': 2,
+          'standby': 6,
+          'running': 3
+        },
+        {
+          'device_name': '包装',
+          'failure': 5,
+          'shutdown': 2,
+          'standby': 6,
+          'running': 3
+        }
+      ],
+      'YZDayList': [
+        {
+          'plan_qty': 40572,
+          'real_qty': 32967,
+          'qualified_qty': 22058,
+          'unqualified_qty': 909,
+          'device_code': 'YJ01',
+          'material_code': null,
+          'device_name': '压机1',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 15500,
+          'real_qty': 15060,
+          'qualified_qty': 5044,
+          'unqualified_qty': 16,
+          'device_code': 'YJ02',
+          'material_code': null,
+          'device_name': '压机2',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 12500,
+          'real_qty': 5898,
+          'qualified_qty': 5761,
+          'unqualified_qty': 137,
+          'device_code': 'YJ03',
+          'material_code': null,
+          'device_name': '压机3',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 2340,
+          'real_qty': 1902,
+          'qualified_qty': 1850,
+          'unqualified_qty': 52,
+          'device_code': 'YJ04',
+          'material_code': null,
+          'device_name': '压机4',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ05',
+          'material_code': null,
+          'device_name': '压机5',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ06',
+          'material_code': null,
+          'device_name': '压机6',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ07',
+          'material_code': null,
+          'device_name': '压机7',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ08',
+          'material_code': null,
+          'device_name': '压机8',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ09',
+          'material_code': null,
+          'device_name': '压机9',
+          'region_code': 'YZ'
+        },
+        {
+          'plan_qty': 0,
+          'real_qty': 0,
+          'qualified_qty': 0,
+          'unqualified_qty': 0,
+          'device_code': 'YJ10',
+          'material_code': null,
+          'device_name': '压机10',
+          'region_code': 'YZ'
+        }
+      ],
+      'MixMachineList': [
+        {
+          'device_status': 1,
+          'device_code': 'HLJ01'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ02'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ03'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ04'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ05'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ06'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ07'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ08'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ09'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ10'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ11'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ12'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ13'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ14'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ15'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'HLJ16'
+        }
+      ],
+      'LastMonthFailureList': [
+        {
+          'device_name': '机器1',
+          'failure': 11,
+          'shutdown': null,
+          'standby': null,
+          'running': null
+        },
+        {
+          'device_name': '机器2',
+          'failure': 12,
+          'shutdown': null,
+          'standby': null,
+          'running': null
+        },
+        {
+          'device_name': '机器3',
+          'failure': 15,
+          'shutdown': null,
+          'standby': null,
+          'running': null
+        },
+        {
+          'device_name': '机器4',
+          'failure': 29,
+          'shutdown': null,
+          'standby': null,
+          'running': null
+        },
+        {
+          'device_name': '机器5',
+          'failure': 26,
+          'shutdown': null,
+          'standby': null,
+          'running': null
+        }
+      ],
+      'PressMachineList': [
+        {
+          'device_status': 1,
+          'device_code': 'YJ01'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ02'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ03'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ04'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ05'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ06'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ07'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ08'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ09'
+        },
+        {
+          'device_status': 1,
+          'device_code': 'YJ10'
+        }
+      ],
+      'TrappedShelfList': [
+        {
+          'point_name': '压机1空盅货位',
+          'point_status_name': '无货',
+          'point_code': 'KLHW41',
+          'point_status': '0'
+        },
+        {
+          'point_name': '压机1困料货位1',
+          'point_status_name': '有货',
+          'point_code': 'KLHW42',
+          'point_status': '1'
+        },
+        {
+          'point_name': '压机1困料货位2',
+          'point_status_name': '有货',
+          'point_code': 'KLHW43',
+          'point_status': '1'
+        },
+        {
+          'point_name': '压机1困料货位3',
+          'point_status_name': '有货',
+          'point_code': 'KLHW44',
+          'point_status': '1'
+        },
+        {
+          'point_name': '压机2空盅货位',
+          'point_status_name': '无货',
+          'point_code': 'KLHW45',
+          'point_status': '0'
+        },
+        {
+          'point_name': '压机2困料货位1',
+          'point_status_name': '有货',
+          'point_code': 'KLHW46',
+          'point_status': '1'
+        },
+        {
+          'point_name': '压机2困料货位2',
+          'point_status_name': '无货',
+          'point_code': 'KLHW47',
+          'point_status': '0'
+        },
+        {
+          'point_name': '压机2困料货位3',
+          'point_status_name': '无货',
+          'point_code': 'KLHW48',
+          'point_status': '0'
+        }
+      ],
+      'MixBlankingList': [
+        {
+          'point_name': '混料机1下料位',
+          'point_code': 'HLJ01XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机2下料位',
+          'point_code': 'HLJ02XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机3下料位',
+          'point_code': 'HLJ03XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机4下料位',
+          'point_code': 'HLJ04XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机5下料位',
+          'point_code': 'HLJ05XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机6下料位',
+          'point_code': 'HLJ06XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机7下料位',
+          'point_code': 'HLJ07XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机8下料位',
+          'point_code': 'HLJ08XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机9下料位',
+          'point_code': 'HLJ09XL01',
+          'point_status': '0'
+        },
+        {
+          'point_name': '混料机10下料位',
+          'point_code': 'HLJ10XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机11下料位',
+          'point_code': 'HLJ11XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机12下料位',
+          'point_code': 'HLJ12XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机13下料位',
+          'point_code': 'HLJ13XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机14下料位',
+          'point_code': 'HLJ14XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机15下料位',
+          'point_code': 'HLJ15XL01',
+          'point_status': '1'
+        },
+        {
+          'point_name': '混料机16下料位',
+          'point_code': 'HLJ16XL01',
+          'point_status': '1'
+        }
+      ],
+      'CPDayList': [
+        {
+          'qualified_in_qty': 367,
+          'unqualified_in_qty': 429,
+          'inventory_qty': 994,
+          'material_code': '成品1'
+        },
+        {
+          'qualified_in_qty': 833,
+          'unqualified_in_qty': 1876,
+          'inventory_qty': 511,
+          'material_code': '成品2'
+        },
+        {
+          'qualified_in_qty': 1467,
+          'unqualified_in_qty': 1833,
+          'inventory_qty': 1147,
+          'material_code': '成品3'
+        },
+        {
+          'qualified_in_qty': 492,
+          'unqualified_in_qty': 262,
+          'inventory_qty': 1728,
+          'material_code': '成品4'
+        },
+        {
+          'qualified_in_qty': 831,
+          'unqualified_in_qty': 1561,
+          'inventory_qty': 642,
+          'material_code': '成品5'
+        }
+      ],
+      'LastTenFailureList': [
+        {
+          'failure_time': '05-30 09:50:12',
+          'device_code': 'hn01',
+          'device_name': '混黏01',
+          'failure_info': '机器故障',
+          'device_status_name': '待机'
+        },
+        {
+          'failure_time': '05-30 09:50:12',
+          'device_code': 'hn01',
+          'device_name': '混黏01',
+          'failure_info': '机器故障',
+          'device_status_name': '待机'
+        },
+        {
+          'failure_time': '05-30 09:50:12',
+          'device_code': 'hn01',
+          'device_name': '混黏01',
+          'failure_info': '机器故障',
+          'device_status_name': '待机'
+        },
+        {
+          'failure_time': '05-30 09:50:12',
+          'device_code': 'hn01',
+          'device_name': '混黏01',
+          'failure_info': '机器故障',
+          'device_status_name': '待机'
+        },
+        {
+          'failure_time': '05-30 09:50:12',
+          'device_code': 'hn01',
+          'device_name': '混黏01',
+          'failure_info': '机器故障',
+          'device_status_name': '待机'
+        }
+      ],
+      'StackingPositionList': [
+        {
+          'color_status': 3,
+          'point_name': '压机1下料位1',
+          'point_code': 'YJ01XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机1下料位2',
+          'point_code': 'YJ01XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机2下料位1',
+          'point_code': 'YJ02XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机2下料位2',
+          'point_code': 'YJ02XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机3下料位1',
+          'point_code': 'YJ03XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机3下料位2',
+          'point_code': 'YJ03XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机4下料位1',
+          'point_code': 'YJ04XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机4下料位2',
+          'point_code': 'YJ04XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机5下料位1',
+          'point_code': 'YJ05XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机5下料位2',
+          'point_code': 'YJ05XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机6下料位1',
+          'point_code': 'YJ06XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机6下料位2',
+          'point_code': 'YJ06XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机7下料位1',
+          'point_code': 'YJ07XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机7下料位2',
+          'point_code': 'YJ07XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机8下料位1',
+          'point_code': 'YJ08XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机8下料位2',
+          'point_code': 'YJ08XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机9下料位1',
+          'point_code': 'YJ09XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机9下料位2',
+          'point_code': 'YJ09XL02',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机10下料位1',
+          'point_code': 'YJ10XL01',
+          'region_code': 'YZ'
+        },
+        {
+          'color_status': 3,
+          'point_name': '压机10下料位2',
+          'point_code': 'YJ10XL02',
+          'region_code': 'YZ'
+        }
+      ]
+    }
+  }
+  return res
+}
diff --git a/src/images/workshop/blj.png b/src/images/workshop/blj.png
new file mode 100644
index 0000000..8126747
Binary files /dev/null and b/src/images/workshop/blj.png differ
diff --git a/src/images/workshop/hlj.png b/src/images/workshop/hlj_gray.png
similarity index 100%
rename from src/images/workshop/hlj.png
rename to src/images/workshop/hlj_gray.png
diff --git a/src/images/workshop/hlj_green.png b/src/images/workshop/hlj_green.png
new file mode 100644
index 0000000..a27133e
Binary files /dev/null and b/src/images/workshop/hlj_green.png differ
diff --git a/src/images/workshop/hlj_red.png b/src/images/workshop/hlj_red.png
new file mode 100644
index 0000000..de0f180
Binary files /dev/null and b/src/images/workshop/hlj_red.png differ
diff --git a/src/images/workshop/hlj_s.png b/src/images/workshop/hlj_s_gray.png
similarity index 100%
rename from src/images/workshop/hlj_s.png
rename to src/images/workshop/hlj_s_gray.png
diff --git a/src/images/workshop/hlj_s_green.png b/src/images/workshop/hlj_s_green.png
new file mode 100644
index 0000000..49494d4
Binary files /dev/null and b/src/images/workshop/hlj_s_green.png differ
diff --git a/src/images/workshop/hlj_s_red.png b/src/images/workshop/hlj_s_red.png
new file mode 100644
index 0000000..6b9f289
Binary files /dev/null and b/src/images/workshop/hlj_s_red.png differ
diff --git a/src/images/workshop/hlj_s_yellow.png b/src/images/workshop/hlj_s_yellow.png
new file mode 100644
index 0000000..88471c0
Binary files /dev/null and b/src/images/workshop/hlj_s_yellow.png differ
diff --git a/src/images/workshop/hlj_yellow.png b/src/images/workshop/hlj_yellow.png
new file mode 100644
index 0000000..aca72bc
Binary files /dev/null and b/src/images/workshop/hlj_yellow.png differ
diff --git a/src/images/workshop/robot_2500_green.png b/src/images/workshop/robot_2500_green.png
new file mode 100644
index 0000000..6cf15b3
Binary files /dev/null and b/src/images/workshop/robot_2500_green.png differ
diff --git a/src/images/workshop/robot_cmd_green.png b/src/images/workshop/robot_cmd_green.png
new file mode 100644
index 0000000..0330523
Binary files /dev/null and b/src/images/workshop/robot_cmd_green.png differ
diff --git a/src/images/workshop/yj_2500_gray.png b/src/images/workshop/yj_2500_gray.png
new file mode 100644
index 0000000..f16bd9e
Binary files /dev/null and b/src/images/workshop/yj_2500_gray.png differ
diff --git a/src/images/workshop/yj_2500_green.png b/src/images/workshop/yj_2500_green.png
new file mode 100644
index 0000000..8922044
Binary files /dev/null and b/src/images/workshop/yj_2500_green.png differ
diff --git a/src/images/workshop/yj_2500_red.png b/src/images/workshop/yj_2500_red.png
new file mode 100644
index 0000000..7676ff4
Binary files /dev/null and b/src/images/workshop/yj_2500_red.png differ
diff --git a/src/images/workshop/yj_2500_yellow.png b/src/images/workshop/yj_2500_yellow.png
new file mode 100644
index 0000000..c595788
Binary files /dev/null and b/src/images/workshop/yj_2500_yellow.png differ
diff --git a/src/images/workshop/yj_630_gray.png b/src/images/workshop/yj_630_gray.png
new file mode 100644
index 0000000..fa36d48
Binary files /dev/null and b/src/images/workshop/yj_630_gray.png differ
diff --git a/src/images/workshop/yj_630_green.png b/src/images/workshop/yj_630_green.png
new file mode 100644
index 0000000..c93f9eb
Binary files /dev/null and b/src/images/workshop/yj_630_green.png differ
diff --git a/src/images/workshop/yj_630_red.png b/src/images/workshop/yj_630_red.png
new file mode 100644
index 0000000..f1866ff
Binary files /dev/null and b/src/images/workshop/yj_630_red.png differ
diff --git a/src/images/workshop/yj_630_yellow.png b/src/images/workshop/yj_630_yellow.png
new file mode 100644
index 0000000..0833183
Binary files /dev/null and b/src/images/workshop/yj_630_yellow.png differ
diff --git a/src/images/workshop/yyj_gray.png b/src/images/workshop/yyj_gray.png
deleted file mode 100644
index 0e5cd1b..0000000
Binary files a/src/images/workshop/yyj_gray.png and /dev/null differ
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index a1d38bc..ccf16f3 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -35,43 +35,80 @@
                 </div>
                 <div class="n_right_content">
                     <div class="right_wrap">
-                      <div class="machine_wrap hlj_s_wrap">
-                        <div v-for="(e,i) in [1,2,3,4]" :key="i" class="sh_machine hlj_s">
-                          <img src="../../../images/workshop/hlj_s.png" alt="">
+                      <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_s_wrap">
+                        <div v-for="(e,i) in MixMachineList.slice(0, 4)" :key="i" class="sh_machine hlj_s">
+                          <img v-show="e.device_status === 0" src="../../../images/workshop/hlj_s_gray.png" alt="">
+                          <img v-show="e.device_status === 1" src="../../../images/workshop/hlj_s_yellow.png" alt="">
+                          <img v-show="e.device_status === 2" src="../../../images/workshop/hlj_s_green.png" alt="">
+                          <img v-show="e.device_status === 3" src="../../../images/workshop/hlj_s_red.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap hlj_wrap">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i"  class="sh_machine hlj">
-                          <img src="../../../images/workshop/hlj.png" alt="">
+                      <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_wrap">
+                        <div v-for="(e,i) in MixMachineList.slice(4)" :key="i"  class="sh_machine hlj">
+                          <img v-show="e.device_status === 0" src="../../../images/workshop/hlj_gray.png" alt="">
+                          <img v-show="e.device_status === 1" src="../../../images/workshop/hlj_yellow.png" alt="">
+                          <img v-show="e.device_status === 2" src="../../../images/workshop/hlj_green.png" alt="">
+                          <img v-show="e.device_status === 3" src="../../../images/workshop/hlj_red.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap lz_wrap_1">
-                        <div v-for="(e,i) in [1,2,3,4]" :key="i" class="sh_machine lz">
+                      <div v-if="MixBlankingList.length > 0" class="machine_wrap lz_wrap_1">
+                        <div v-for="(e,i) in MixBlankingList.slice(0, 4)" :key="i" class="sh_machine lz">
+                          <img v-show="e.point_status === '1'" src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div v-if="MixBlankingList.length > 0" class="machine_wrap lz_wrap_2">
+                        <div v-for="(e,i) in MixBlankingList.slice(4)" :key="i" class="sh_machine lz">
+                          <img v-show="e.point_status === '1'" src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
+                        <div class="sh_machine lz_1">
+                          <img :class="TrappedShelfList[0].point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                        <div class="sh_machine lz_1 lz_2">
+                          <img v-for="(e,i) in TrappedShelfList.slice(1, 4)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="e.point_status === '0' ? 'hidden': ''">
+                        </div>
+                      </div>
+                      <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1 yjlz_wrap_2">
+                        <div class="sh_machine lz_1">
+                          <img :class="TrappedShelfList[4].point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                        <div class="sh_machine lz_1 lz_2">
+                          <img v-for="(e,i) in TrappedShelfList.slice(4)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="e.point_status === '0' ? 'hidden': ''">
+                        </div>
+                      </div>
+                      <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
+                        <div class="sh_machine lz_1">
                           <img src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap lz_wrap_2">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i" class="sh_machine lz">
+                      <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_5">
+                        <div class="sh_machine lz_1">
                           <img src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap lz_wrap_3">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i" class="sh_machine lz">
+                      <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_7">
+                        <div class="sh_machine lz_1">
                           <img src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1">
-                        <!-- <div class="sh_machine yj_gif">
-                          <img src="../../../images/workshop/yj_2500.gif" alt="">
-                        </div> -->
+                      <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_8">
+                        <div class="sh_machine lz_1">
+                          <img src="../../../images/workshop/lz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="machine_wrap yj_wrap_1">
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_2.png" alt="">
                         </div>
                         <div class="sh_machine jzjcss">
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
-                        <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
+                          <img v-show="PressMachineList[0].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <img v-show="PressMachineList[0].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                          <img v-show="PressMachineList[0].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
+                          <img v-show="PressMachineList[0].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -81,22 +118,25 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                         <div class="sh_machine block_1">
                         </div>
                         <div class="sh_machine block_1 block_2">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_2">
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_1.png" alt="">
                         </div>
                         <div class="sh_machine jzjcss">
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
-                        <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
+                          <img v-show="PressMachineList[1].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <img v-show="PressMachineList[1].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                          <img v-show="PressMachineList[1].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
+                          <img v-show="PressMachineList[1].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -106,15 +146,29 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                        </div>
+                        <div class="sh_machine block_1 block_2">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3">
+                        <div class="sh_machine blj_1">
+                          <img src="../../../images/workshop/blj.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine blj_1 blj_2">
+                          <img src="../../../images/workshop/blj.png" alt="">
+                        </div>
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
+                          <img v-show="PressMachineList[2].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[2].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[2].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[2].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
+                          <img v-show="PressMachineList[3].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[3].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[3].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[3].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -141,15 +195,24 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
+                        <div class="sh_machine blj_1">
+                          <img src="../../../images/workshop/blj.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
+                          <img v-show="PressMachineList[4].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[4].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[4].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[4].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
+                          <img v-show="PressMachineList[5].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[5].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[5].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[5].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -164,9 +227,15 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
+                        <div class="sh_machine blj_1">
+                          <img src="../../../images/workshop/blj.png" alt="">
+                        </div>
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
+                          <img v-show="PressMachineList[6].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[6].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[6].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[6].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -181,15 +250,24 @@
                           <img src="../../../images/workshop/jcpmj.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
+                        <div class="sh_machine blj_1 blj_2">
+                          <img src="../../../images/workshop/blj.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
+                          <img v-show="PressMachineList[7].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[7].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[7].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[7].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
+                          <img v-show="PressMachineList[8].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[8].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[8].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[8].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -204,39 +282,42 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2 yyj_wrap_3">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_2 yj_wrap_17">
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_5">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_15">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_6">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_13">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3 cyj_wrap_7">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7 yj_wrap_12">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4 cyj_wrap_8">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8 yj_wrap_10">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
+                          <img v-show="PressMachineList[9].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="PressMachineList[9].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="PressMachineList[9].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="PressMachineList[9].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1 kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -263,24 +344,71 @@
 </template>
 
 <script>
+import { workshopCondition } from '@js/getData2'
 export default {
   name: 'one',
   data () {
     return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
       myCharts1: '',
       myCharts2: '',
-      myCharts3: ''
+      myCharts3: '',
+      HLDayList: [],
+      YZDayList: [],
+      CPDayList: [],
+      PressMachineList: [], // 压机数据
+      MixMachineList: [], // 混料机数据
+      MixBlankingList: [], // 混料机下料位
+      TrappedShelfList: [] // 困料位料盅
     }
   },
   mounted () {
-    this.setEchart1()
-    this.setEchart2()
-    this.setEchart3()
+    this._workshopCondition()
+    // this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
   },
   methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this._workshopCondition()
+      }, this.interTime)
+    },
+    async _workshopCondition () {
+      let res = await workshopCondition()
+      if (res.code === 200) {
+        this.HLDayList = [...res.result.HLDayList]
+        this.YZDayList = [...res.result.YZDayList]
+        this.CPDayList = [...res.result.CPDayList]
+        this.PressMachineList = [...res.result.PressMachineList]
+        this.MixMachineList = [...res.result.MixMachineList]
+        this.MixBlankingList = [...res.result.MixBlankingList]
+        this.TrappedShelfList = [...res.result.TrappedShelfList]
+        this.setEchart1()
+        this.setEchart2()
+        this.setEchart3()
+      }
+      // this.dayRows = [...res.result.runningStatus]
+      // this.weekRows = [...res.result.faultyStatus]
+      // this.deviceRows = [...res.result.faultyInfo]
+      // if (this.dayRows.length > 0) {
+      //   this.setEchart1()
+      // }
+      // if (this.weekRows.length > 0) {
+      //   this.setEchart2()
+      // }
+    },
     setEchart1 () {
-      let date = ['碾机1', '碾机2', '碾机3', '碾机4', '碾机5', '碾机6', '碾机7', '碾机8', '碾机9', '碾机10', '碾机11', '碾机12', '碾机13', '碾机14', '碾机15', '碾机16']
-      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000', '500', '600', '700', '800', '500', '600']
+      // let barName = ['碾机1', '碾机2', '碾机3', '碾机4', '碾机5', '碾机6', '碾机7', '碾机8', '碾机9', '碾机10', '碾机11', '碾机12', '碾机13', '碾机14', '碾机15', '碾机16']
+      // let barData = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000', '500', '600', '700', '800', '500', '600']
+      let barName = []
+      let barData = []
+      this.HLDayList.map(el => {
+        barName.push(el.device_name)
+        barData.push(el.real_qty)
+      })
       let option = {
         grid: {
           top: 50,
@@ -321,10 +449,11 @@ export default {
             },
             rotate: 50
           },
-          data: date
+          data: barName
         },
         yAxis: {
           type: 'value',
+          name: '单位：KG',
           axisLine: {
             show: false
           },
@@ -368,7 +497,7 @@ export default {
                 ])
               }
             },
-            data: data1
+            data: barData
           }
         ]
       }
@@ -385,9 +514,17 @@ export default {
       }
     },
     setEchart2 () {
-      let date = ['压机1', '压机2', '压机3', '压机4', '压机5', '压机6', '压机7', '压机8', '压机9', '压机10']
-      let data1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000']
-      let data2 = ['50', '180', '70', '100', '50', '70', '100', '180', '100', '120']
+      // let barName = ['压机1', '压机2', '压机3', '压机4', '压机5', '压机6', '压机7', '压机8', '压机9', '压机10']
+      // let barData1 = ['500', '600', '700', '800', '500', '600', '700', '800', '900', '1000']
+      // let barData2 = ['50', '180', '70', '100', '50', '70', '100', '180', '100', '120']
+      let barName = []
+      let barData1 = []
+      let barData2 = []
+      this.YZDayList.map(el => {
+        barName.push(el.device_name)
+        barData1.push(el.qualified_qty)
+        barData2.push(el.unqualified_qty)
+      })
       let option = {
         grid: {
           top: 50,
@@ -428,10 +565,11 @@ export default {
             },
             rotate: 50
           },
-          data: date
+          data: barName
         },
         yAxis: {
           type: 'value',
+          name: '单位：块',
           axisLine: {
             show: false
           },
@@ -475,7 +613,7 @@ export default {
                 ])
               }
             },
-            data: data1
+            data: barData1
           },
           {
             name: '不合格数',
@@ -497,7 +635,7 @@ export default {
                 ])
               }
             },
-            data: data2
+            data: barData2
           }
         ]
       }
@@ -514,10 +652,20 @@ export default {
       }
     },
     setEchart3 () {
-      let date = ['成品1', '成品2', '成品3', '成品4', '成品5']
-      let data1 = ['1500', '1600', '1700', '1800', '1500']
-      let data2 = ['450', '500', '700', '800', '500']
-      let data3 = ['50', '180', '60', '70', '50']
+      // let barName = ['成品1', '成品2', '成品3', '成品4', '成品5']
+      // let barData1 = ['1500', '1600', '1700', '1800', '1500']
+      // let barData2 = ['450', '500', '700', '800', '500']
+      // let barData3 = ['50', '180', '60', '70', '50']
+      let barName = []
+      let barData1 = []
+      let barData2 = []
+      let barData3 = []
+      this.CPDayList.map(el => {
+        barName.push(el.material_code)
+        barData1.push(el.inventory_qty)
+        barData2.push(el.qualified_in_qty)
+        barData3.push(el.unqualified_in_qty)
+      })
       let option = {
         grid: {
           top: 50,
@@ -558,10 +706,11 @@ export default {
             }
             // rotate: 50
           },
-          data: date
+          data: barName
         },
         yAxis: {
           type: 'value',
+          name: '单位：块',
           axisLine: {
             show: false
           },
@@ -586,7 +735,7 @@ export default {
         },
         series: [
           {
-            name: '弯头工段',
+            name: '库存数',
             type: 'bar',
             barWidth: '8',
             barGap: '200%',
@@ -606,10 +755,10 @@ export default {
                 ])
               }
             },
-            data: data1
+            data: barData1
           },
           {
-            name: '综合工段',
+            name: '合格入库',
             type: 'bar',
             barWidth: '8',
             barGap: '200%',
@@ -629,10 +778,10 @@ export default {
                 ])
               }
             },
-            data: data2
+            data: barData2
           },
           {
-            name: '成品工段',
+            name: '不合格入库',
             type: 'bar',
             barWidth: '8',
             barGap: '200%',
@@ -652,7 +801,7 @@ export default {
                 ])
               }
             },
-            data: data3
+            data: barData3
           }
         ]
       }
@@ -824,39 +973,41 @@ export default {
       top 64%
     &:nth-child(12)
       top 69.5%
-.lz_wrap_3
+.yjlz_wrap_1
   width 2%
-  height 94%
-  top 6%
-  left 35%
-  .lz
-    &:nth-child(2)
-      top 4%
-    &:nth-child(3)
-      top 6.55%
-    &:nth-child(4)
-      top 9.1%
-    &:nth-child(5)
-      top 14%
-    &:nth-child(6)
-      top 18%
-    &:nth-child(7)
-      top 20.5%
-    &:nth-child(8)
-      top 23%
-    &:nth-child(9)
-      top 40%
-      left 200%
-    &:nth-child(10)
-      top 54%
-      left 200%
-    &:nth-child(11)
-      top 76%
-      left 200%
-    &:nth-child(12)
-      top 86%
-      left 200%
-.yyj_wrap_1
+  height 16.442%
+  top 3%
+  left 38%
+  .lz_1
+    width 100%
+    img
+      position relative
+  .lz_2
+    top auto
+    bottom 0
+.yjlz_wrap_2
+  top 22%
+.yjlz_wrap_3
+  top 41%
+  .lz_1
+    top 50%
+    transform translateY(-50%)
+.yjlz_wrap_5
+  top 60%
+  .lz_1
+    top 50%
+    transform translateY(-50%)
+.yjlz_wrap_7
+  top 75%
+  .lz_1
+    top 50%
+    transform translateY(-50%)
+.yjlz_wrap_8
+  top 89%
+  .lz_1
+    top 50%
+    transform translateY(-50%)
+.yj_wrap_1
   width 16%
   height 16.442%
   top 3%
@@ -904,7 +1055,7 @@ export default {
     background-color #fff
   .block_2
     left:86%
-.yyj_wrap_2
+.yj_wrap_2
   top 22%
   .robot
     animation rotate_630_1 1.5s linear 1.5s infinite alternate-reverse
@@ -916,8 +1067,17 @@ export default {
     top 76%
   .weilan
     top 16%
-.cyj_wrap_1
+  .block_2
+    top 9%
+    left: 89%;
+.yj_wrap_3
   top 41%
+  .blj_1
+    width: 18%;
+    top: 14%;
+    left: 16%;
+  .blj_2
+    top 70%
   .cyj_1
     width 50%
     height 50%
@@ -960,7 +1120,7 @@ export default {
   .kongtuopan_4
     top: 64%
     left: 80%;
-.cyj_wrap_2
+.yj_wrap_5
   top 60%
   .kongtuopan_1
     top: 14%;
@@ -972,8 +1132,10 @@ export default {
     top 70%
   .kongtuopan_4
     top 86%
-.cyj_wrap_3
+.yj_wrap_7
   top 75%
+  .blj_1
+    top 42%
   .cyj_1
     top 25%
     img
@@ -984,7 +1146,7 @@ export default {
   .robot
     left: 75%
     transform: rotate(15deg);
-    animation rotate_630_2 3s linear 1.5s infinite reverse
+    animation rotate_630_2 3s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
     top 43%
     left 90%
@@ -995,25 +1157,25 @@ export default {
     width: 18%;
     top: 12%;
     left: 57%;
-.cyj_wrap_4
+.yj_wrap_8
   top 89%
-.yyj_wrap_3
+.yj_wrap_17
   left auto
   right 13%
   .yyj
     img
       left -23%
       transform rotate(180deg)
-.cyj_wrap_5
+.yj_wrap_15
   left auto
   right 17%
-.cyj_wrap_6
+.yj_wrap_13
   left auto
   right 17%
-.cyj_wrap_7
+.yj_wrap_12
   left auto
   right 17%
-.cyj_wrap_8
+.yj_wrap_10
   left auto
   right 17%
   .kongtuopan_3
@@ -1045,56 +1207,56 @@ export default {
       _wh(100%, auto)
 @keyframes rotate_2500_1 {
     0% {
-      transform: rotate(-46deg)
+      transform: rotateZ(-46deg)
     }
     10% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     20% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     90% {
-        transform: rotate(-120deg)
+        transform: rotateZ(-120deg) rotateY(-30deg)
     }
     100% {
-        transform: rotate(-120deg)
+        transform: rotateZ(-120deg) rotateY(0deg)
     }
 }
 @keyframes rotate_630_1 {
     0% {
-      transform: rotate(-46deg)
+      transform: rotateZ(-46deg)
     }
     10% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     20% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     90% {
-        transform: rotate(-90deg)
+        transform: rotateZ(-90deg)
     }
     100% {
-        transform: rotate(-90deg)
+        transform: rotateZ(-90deg)
     }
 }
 @keyframes rotate_630_2 {
     0% {
-      transform: rotate(150deg)
+      transform: rotateZ(150deg) rotateY(-30deg)
     }
     10% {
-        transform: rotate(150deg)
+        transform: rotateZ(150deg) rotateY(0deg)
     }
     50% {
-        transform: rotate(70deg)
+        transform: rotateZ(70deg) rotateY(-30deg)
     }
     60% {
-        transform: rotate(70deg)
+        transform: rotateZ(70deg) rotateY(0deg)
     }
     90% {
-        transform: rotate(15deg)
+        transform: rotateZ(15deg)
     }
     100% {
-        transform: rotate(15deg)
+        transform: rotateZ(15deg)
     }
 }
 </style>
diff --git a/src/pages/modules/homepage/one_back.vue b/src/pages/modules/homepage/one_back.vue
index 95606f4..98d1dd8 100644
--- a/src/pages/modules/homepage/one_back.vue
+++ b/src/pages/modules/homepage/one_back.vue
@@ -37,12 +37,12 @@
                     <div class="right_wrap">
                       <div class="machine_wrap hlj_s_wrap">
                         <div v-for="(e,i) in [1,2,3,4]" :key="i" class="sh_machine hlj_s">
-                          <img src="../../../images/workshop/hlj_s.png" alt="">
+                          <img src="../../../images/workshop/hlj_s_gray.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap hlj_wrap">
                         <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i"  class="sh_machine hlj">
-                          <img src="../../../images/workshop/hlj.png" alt="">
+                          <img src="../../../images/workshop/hlj_gray.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap lz_wrap_1">
@@ -68,7 +68,7 @@
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -89,7 +89,7 @@
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -104,10 +104,10 @@
                       </div>
                       <div class="machine_wrap cyj_wrap_1">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -130,10 +130,10 @@
                       </div>
                       <div class="machine_wrap cyj_wrap_2">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -167,10 +167,10 @@
                       </div>
                       <div class="machine_wrap cyj_wrap_2 cyj_wrap_4">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -187,37 +187,37 @@
                       </div>
                       <div class="machine_wrap yyj_wrap_3">
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                       </div>
                       <div class="machine_wrap cyj_wrap_1 cyj_wrap_5">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap cyj_wrap_1 cyj_wrap_6">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_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="">
+                          <img src="../../../images/workshop/yj_630_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="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 514ae87..8b46c75 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -9,6 +9,7 @@
             <div class="n_body_container_wraper">
                 <div class="n_left_content">
                     <div class="status_wrap">
+                        <!-- 关机0 待机1 运行中2 故障3-->
                         <div class="status_item">
                             <div class="status_tip green"></div>
                             <div class="status_name">运行中/困料中</div>
@@ -84,8 +85,8 @@
                           <div class="sh_machine kongtuopan_2">
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
-                          <div class="sh_machine robot_1">
-                            <img src="../../../images/workshop/robot_4.png" alt="">
+                          <div class="sh_machine robot_1 rotate_1">
+                            <img src="../../../images/workshop/robot_cmd_green.png" alt="">
                           </div>
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
@@ -99,8 +100,8 @@
                           <div class="sh_machine cmdssj_1 cmdssj_2">
                             <img src="../../../images/workshop/cmdssj.png" alt="">
                           </div>
-                          <div class="sh_machine robot_2">
-                            <img src="../../../images/workshop/robot_4.png" alt="">
+                          <div class="sh_machine robot_2 rotate_2">
+                            <img src="../../../images/workshop/robot_cmd_green.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap cmd_wrap_1 cmd_wrap_2">
@@ -265,14 +266,14 @@
                                     <li>当前状态</li>
                                 </ul>
                                 <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="LastTenFailureList" :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>
+                                            <li v-for="(e, i) in LastTenFailureList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.failure_time}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.failure_info}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_status_name}}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -287,13 +288,18 @@
 </template>
 
 <script>
+import { workshopCondition } from '@js/getData2'
 export default {
   name: 'two',
   data () {
     return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
       myCharts1: '',
       myCharts2: '',
-      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: '故障'}]
+      DeviceConditionList: [],
+      LastMonthFailureList: [],
+      LastTenFailureList: []
     }
   },
   computed: {
@@ -311,15 +317,50 @@ export default {
     }
   },
   mounted () {
-    this.setEchart1()
-    this.setEchart2()
+    this._workshopCondition()
+    // this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
   },
   methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this._workshopCondition()
+      }, this.interTime)
+    },
+    async _workshopCondition () {
+      let res = await workshopCondition()
+      if (res.code === 200) {
+        this.DeviceConditionList = [...res.result.DeviceConditionList]
+        this.LastMonthFailureList = [...res.result.LastMonthFailureList]
+        this.LastTenFailureList = [...res.result.LastTenFailureList]
+        this.setEchart1()
+        this.setEchart2()
+      }
+    },
     setEchart1 () {
       let colors = ['#30EBC9', '#E2BB0E', '#516282', '#F96700']
       let status = ['运行', '待机', '关机', '故障']
-      let barName = ['混料', '压制', '干燥', '包装']
-      let data = [[16, 14, 6, 9], [2, 1, 2, 3], [0, 0, 2, 2], [2, 1, 2, 3]]
+      // let barName = ['混料', '压制', '干燥', '包装']
+      // let data = [[16, 14, 6, 9], [2, 1, 2, 3], [0, 0, 2, 2], [2, 1, 2, 3]]
+      let barName = []
+      let data = []
+      let running = []
+      let standby = []
+      let shutdown = []
+      let failure = []
+      this.DeviceConditionList.map(el => {
+        barName.push(el.device_name)
+        running.push(el.running)
+        standby.push(el.standby)
+        shutdown.push(el.shutdown)
+        failure.push(el.failure)
+      })
+      data.push(running)
+      data.push(standby)
+      data.push(shutdown)
+      data.push(failure)
       let option = {
         grid: {
           top: 50,
@@ -427,16 +468,22 @@ export default {
       }
     },
     setEchart2 () {
-      let barName = ['机器5', '混碾5', '机器1', '混碾2', '压机1']
-      let barData = [6, 7, 8, 9, 10]
+      // let barName = ['机器5', '混碾5', '机器1', '混碾2', '压机1']
+      // let barData = [6, 7, 8, 9, 10]
+      let barName = []
+      let barData = []
+      this.LastMonthFailureList.map(el => {
+        barName.push(el.device_name)
+        barData.push(el.failure)
+      })
       let maxNum = 0
       for (let i = 0; i < barData.length; i++) {
         if (barData[i] > maxNum) {
           maxNum = barData[i]
         }
       }
-
-      var option = {
+      maxNum = Math.ceil(maxNum / 5) * 5
+      let option = {
         grid: {
           top: 5,
           left: 0,
@@ -530,7 +577,7 @@ export default {
               distance: 70,
               align: 'right',
               formatter: function (params) {
-                return params.data.realValue + ' 台'
+                return params.data.realValue + ' 次'
               },
               color: '#fff',
               fontSize: 15
@@ -778,9 +825,15 @@ export default {
   top: 0
   left: 0
   .robot_1
-    width: 20%;
-    left: 38%;
-    top: 0
+    left: 48%;
+    top: 10%;
+    width 1%
+    height 1%
+    transform: rotate(-90deg)
+    img
+      width: 2000%;
+      top: -2000%;
+      left: -1000%;
   .kongtuopan_1
     width 26%
     top 3%
@@ -821,10 +874,16 @@ export default {
     img
       transform rotate(0deg)
 .robot_2
-    width: 20%;
-    left: 38%;
     top: auto;
-    bottom: 12%
+    bottom: -13%
+    left: 48%;
+    width 1%
+    height 1%
+    transform: rotate(-90deg)
+    img
+      width: 2000%;
+      top: -2000%;
+      left: -1000%;
 .cmd_wrap_2
   left 38%
 .liu_wrap
@@ -935,4 +994,36 @@ export default {
   left: 76%;
   top: 58%;
   transform: rotate(-90deg);
+.rotate_1
+  animation rotate_1 1.5s linear 1.5s infinite alternate-reverse
+@keyframes rotate_1 {
+    0% {
+      transform: rotateZ(-90deg)
+    }
+    10% {
+        transform: rotateZ(-90deg)
+    }
+    90% {
+        transform: rotateZ(-180deg)
+    }
+    100% {
+        transform: rotateZ(-180deg)
+    }
+}
+.rotate_2
+  animation rotate_2 1.5s linear 1.5s infinite alternate-reverse
+@keyframes rotate_2 {
+    0% {
+      transform: rotateZ(0deg)
+    }
+    10% {
+        transform: rotateZ(0deg)
+    }
+    90% {
+        transform: rotateZ(-90deg)
+    }
+    100% {
+        transform: rotateZ(-90deg)
+    }
+}
 </style>
diff --git a/src/pages/modules/hunniankunliao/one.vue b/src/pages/modules/hunniankunliao/one.vue
index ea1a6cb..56c00f3 100644
--- a/src/pages/modules/hunniankunliao/one.vue
+++ b/src/pages/modules/hunniankunliao/one.vue
@@ -28,7 +28,7 @@
                   </div>
                   <div class="box_l1">
                     <div  v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12]" :key="i" class="picbox">
-                      <img src="../../../images/workshop/hlj_s.png" alt="">
+                      <img src="../../../images/workshop/hlj_s_gray.png" alt="">
                     </div>
                   </div>
                   <div class="box_l2">
@@ -38,7 +38,7 @@
                   </div>
                   <div class="box_r1">
                     <div  v-for="(e,i) in [1,2,3,4]" :key="i" class="picbox">
-                      <img src="../../../images/workshop/hlj_s.png" alt="">
+                      <img src="../../../images/workshop/hlj_s_gray.png" alt="">
                     </div>
                   </div>
                   <div class="box_r2">
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 1f46fed..f114c88 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -73,7 +73,11 @@
                         </div>
                       </div>
                     </div>
-                    <div class="machine_wrap yyj_wrap_1">
+                    <div class="yaji_wrap">
+                      <div class="machine_wrap yyj_wrap_1">
+                        <!-- <div class="sh_machine yj_gif">
+                          <img src="../../../images/workshop/yj_2500.gif" alt="">
+                        </div> -->
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_2.png" alt="">
                         </div>
@@ -81,20 +85,24 @@
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_1.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap yyj_wrap_2">
+                        <div class="sh_machine block_1">
+                        </div>
+                        <div class="sh_machine block_1 block_2">
+                        </div>
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2">
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_1.png" alt="">
                         </div>
@@ -102,177 +110,184 @@
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_1.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_1">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.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 class="sh_machine jzjcj_1">
+                          <img src="../../../images/workshop/jzjcj_630.png" alt="">
+                        </div>
+                        <div class="sh_machine jzjcj_1 jzjcj_2">
+                          <img src="../../../images/workshop/jzjcj_630.png" alt="">
+                        </div>
+                        <div class="sh_machine lmyzj">
+                          <img src="../../../images/workshop/lmyzj_630.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_3">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_4">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_2">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_3">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_4">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_3">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine weilan">
-                          <img src="../../../images/workshop/weilan_2.png" alt="">
+                          <img src="../../../images/workshop/weilan_6.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine jcpmj">
                           <img src="../../../images/workshop/jcpmj.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_3.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_2 cyj_wrap_4">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_3">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_4">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap yyj_wrap_2 yyj_wrap_3">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2 yyj_wrap_3">
                         <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yyj_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_1 cyj_wrap_5">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_5">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_2 cyj_wrap_6">
+                      </div>
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_6">
                         <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_2">
-                          <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                    </div>
-                    <div class="machine_wrap cyj_wrap_3 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_2 cyj_wrap_8">
-                      <div class="sh_machine cyj_1">
-                        <img src="../../../images/workshop/cyj_1_gray.png" alt="">
+                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3 cyj_wrap_7">
+                        <div class="sh_machine cyj_1">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </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 class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4 cyj_wrap_8">
+                        <div class="sh_machine cyj_1">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
+                        <div class="sh_machine cyj_1 cyj_2">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
+                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
+                          <img src="../../../images/workshop/ktp.png" alt="">
+                        </div>
+                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
+                          <img src="../../../images/workshop/ktp.png" alt="">
+                        </div>
                       </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="">
+                        <img src="../../../images/workshop/yj_630_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="">
+                        <img src="../../../images/workshop/yj_630_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="">
+                        <img src="../../../images/workshop/yj_630_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="">
+                        <img src="../../../images/workshop/yj_630_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="">
+                        <img src="../../../images/workshop/yj_630_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="">
+                        <img src="../../../images/workshop/yj_630_gray.png" alt="">
                       </div>
                     </div>
                 </div>
@@ -351,239 +366,6 @@
     left 0
     z-index 4
     _wh(100%, auto)
-.yyj_wrap_1
-  width 16%
-  height 14%
-  top 20%
-  right -2%
-  transform rotate(90deg)
-  .yyj
-    width 28.22%
-    height 42%
-    left 30.5%
-    img
-      _wh(100%, 100%)
-  .wzm
-    _wh(50.9%, 46.95%)
-    background-color #d9d9d9
-    top auto
-    bottom 0
-  .jzjcss
-    width 22%
-    left 51%
-    top 11%
-  .weilan
-    width 49.1%
-    height 73%
-    left auto
-    right 0
-    top auto
-    bottom 0
-  .robot
-    width: 26%;
-    left: 53%;
-    top: 62%;
-  .kongtuopan_1
-    width: 10%;
-    top: 113%;
-    left: 60%;
-  .kongtuopan_2
-    width 10%
-    top: 113%;
-    left: 72%;
-.yyj_wrap_2
-  width 16%
-  height 14%
-  top 20%
-  right 12%
-  transform rotate(90deg)
-  .yyj
-    width 28.22%
-    height 42%
-    left 30.5%
-    img
-      _wh(100%, 100%)
-  .wzm
-    _wh(50.9%, 46.95%)
-    background-color #d9d9d9
-    top auto
-    bottom 0
-  .jzjcss
-    width 22%
-    left 51%
-    top 11%
-  .weilan
-    width: 34%;
-    height: 73%;
-    left: 53%;
-    top 27%
-  .robot
-    width 24%
-    left 72%
-    top 65%
-    transform rotate(90deg)
-  .kongtuopan_1
-    width 10%
-    top: 53%;
-    left: 76%;
-    transform rotate(90deg)
-  .kongtuopan_2
-    width 10%
-    top: 113%;
-    left: 69%;
-    transform rotate(-90deg)
-.cyj_wrap_1
-  width 11%
-  height 20%
-  top 23%
-  right 29%
-  transform rotate(90deg)
-  .cyj_1
-    width 25%
-    top 0
-  .cyj_2
-    width 25%
-    top 90%
-  .jzjcss
-    width: 32%;
-    left: 25%;
-    top: 43%;
-  .weilan
-    width 70%
-    left auto
-    right 0
-    top 48%
-  .robot
-    width: 18%;
-    top: 71%;
-    left: auto;
-    right: 19%;
-  .kongtuopan_1
-    width 14.5%
-    top 53%
-    left auto
-    right 35%
-  .kongtuopan_2
-    width 14.5%
-    top 53%
-    left auto
-    right 12%
-  .kongtuopan_3
-    width 14.5%
-    top 90%
-    left auto
-    right 35%
-  .kongtuopan_4
-    width 14.5%
-    top 90%
-    left auto
-    right 12%
-.cyj_wrap_2
-  width 11%
-  height 20%
-  top 23%
-  left 39%
-  transform rotate(90deg)
-  .cyj_1
-    width 25%
-  .cyj_2
-    width 25%
-    top 90%
-  .kongtuopan_1
-    width 14.5%
-    top: 19%;
-    left: 38%;
-    transform rotate(90deg)
-  .kongtuopan_2
-    width 14.5%
-    top: 50%;
-    left: 38%;
-    transform rotate(90deg)
-  .kongtuopan_3
-    width 14.5%
-    top: 106%;
-    left: 38%;
-    transform rotate(90deg)
-  .kongtuopan_4
-    width 14.5%
-    top: 139%;
-    left: 38%;
-    transform rotate(90deg)
-.cyj_wrap_3
-  width 11%
-  height 20%
-  top: 23%;
-  left: 18%;
-  transform rotate(90deg)
-  .cyj_1
-    width: 25%;
-  .weilan
-    width 65%
-    left auto
-    right 0
-    top: -8%;
-    img
-      transform rotate(-90deg)
-  .robot
-    width 21%
-    top: 20%;
-    left: 43%;
-  .kongtuopan_1
-    width 14.5%
-    top: 15%;
-    left: auto;
-    right: 13%;
-    transform rotate(90deg)
-  .kongtuopan_2
-    width 14.5%
-    top: 53%
-    left: auto;
-    right: 13%;
-    transform rotate(90deg)
-  .jcpmj
-    width: 16%;
-    top: 0%;
-    left: 46%;
-    img
-      transform rotate(-90deg)
-.cyj_wrap_4
-  left 7%
-.yyj_wrap_3
-  width 16%
-  height 14%
-  top: 62%;
-  transform rotate(90deg)
-  .yyj
-    width 28.22%
-    left -7.5%
-    transform rotate(180deg)
-    height 42%
-    img
-      _wh(100%, 100%)
-  .wzm
-    _wh(50.9%, 46.95%)
-    background-color #d9d9d9
-    top auto
-    bottom 0
-.cyj_wrap_5
-  left auto
-  top 53.6%
-.cyj_wrap_6
-  top 53.6%
-.cyj_wrap_7
-  top: 53.6%;
-.cyj_wrap_8
-  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%
@@ -644,4 +426,230 @@
     &:nth-child(9)
       height: 8%;
       left: 200%
+.yaji_wrap
+  position: absolute;
+  left: 0;
+  top: 15%;
+  width: 98%;
+  height: 55%;
+// 压机
+.yyj_wrap_1
+  width 10.801%
+  height 29.895%
+  transform rotate(90deg)
+  top: 4.4%;
+  left: 90.5%;
+  .yyj
+    width 50%
+    img
+      width: 83%;
+      left: 37%;
+  .wzm
+    _wh(50%, 41%)
+    background-color #d9d9d9
+    top auto
+    bottom 0
+  .jzjcss
+    width: 24%;
+    left: 51%;
+    top: 25%;
+  .weilan
+    width: 46%;
+    left: 54%;
+    top 37%
+  .robot
+    width 1%
+    height 1%
+    left: 75%;
+    top: 55%;
+    transform: rotate(-46deg)
+    animation rotate_2500_1 1.5s linear 1.5s infinite alternate-reverse
+    img
+      width 2400%
+      top: -800%;
+      left: -2000%;
+  .kongtuopan_1
+    width: 12%;
+    top: 81%;
+    left: 61%;
+  .kongtuopan_2
+    left: 74%;
+  .block_1
+    width: 10%;
+    height: 9%;
+    left: 74%;
+    top: 27%;
+    background-color #fff
+  .block_2
+    left:86%
+.yyj_wrap_2
+  left: 80%;
+  .robot
+    animation rotate_630_1 1.5s linear 1.5s infinite alternate-reverse
+  .kongtuopan_1
+    top 37%
+    left 70%
+    transform rotate(90deg)
+  .kongtuopan_2
+    top 76%
+  .weilan
+    top 16%
+.cyj_wrap_1
+  left 70%
+  .cyj_1
+    width 50%
+    height 50%
+    img
+      width 28%
+      left auto
+      right 0
+  .cyj_2
+    top 50%
+    img
+      top auto
+      bottom 0
+  .jzjcj_1
+    width 7%
+    height 50%
+    left 51%
+    img
+      top auto
+      bottom 5%
+  .jzjcj_2
+    top 50%
+    img
+      top 5%
+  .lmyzj
+    width: 13%;
+    left: 54%;
+    top: 33%;
+  .weilan
+    top 6%
+  .robot
+    left: 79%;
+    top: 49%;
+  .kongtuopan_1
+    top: 21%
+    left: 64%;
+  .kongtuopan_2
+    left: 80%;
+  .kongtuopan_3
+    top: 64%
+  .kongtuopan_4
+    top: 64%
+    left: 80%;
+.cyj_wrap_2
+  left 60%
+  .kongtuopan_1
+    top: 14%;
+    left: 64%;
+    transform rotate(90deg)
+  .kongtuopan_2
+    top 30%
+  .kongtuopan_3
+    top 70%
+  .kongtuopan_4
+    top 86%
+.cyj_wrap_3
+  left 50%
+  .cyj_1
+    top 25%
+    img
+      top 50%
+      transform translateY(-50%)
+  .weilan
+    top 15%
+  .robot
+    left: 75%
+    transform: rotate(15deg);
+    animation rotate_630_2 3s linear 1.5s infinite reverse
+  .kongtuopan_1
+    top 43%
+    left 90%
+    transform rotate(90deg)
+  .kongtuopan_2
+    top: 63%
+  .jcpmj
+    width: 18%;
+    top: 12%;
+    left: 57%;
+.cyj_wrap_4
+  top 89%
+.yyj_wrap_3
+  left auto
+  right 13%
+  .yyj
+    img
+      left -23%
+      transform rotate(180deg)
+.cyj_wrap_5
+  left auto
+  right 17%
+.cyj_wrap_6
+  left auto
+  right 17%
+.cyj_wrap_7
+  left auto
+  right 17%
+.cyj_wrap_8
+  left auto
+  right 17%
+  .kongtuopan_3
+    left 18%
+  .kongtuopan_4
+    left 18%
+@keyframes rotate_2500_1 {
+    0% {
+      transform: rotate(-46deg)
+    }
+    10% {
+        transform: rotate(-46deg)
+    }
+    20% {
+        transform: rotate(-46deg)
+    }
+    90% {
+        transform: rotate(-120deg)
+    }
+    100% {
+        transform: rotate(-120deg)
+    }
+}
+@keyframes rotate_630_1 {
+    0% {
+      transform: rotate(-46deg)
+    }
+    10% {
+        transform: rotate(-46deg)
+    }
+    20% {
+        transform: rotate(-46deg)
+    }
+    90% {
+        transform: rotate(-90deg)
+    }
+    100% {
+        transform: rotate(-90deg)
+    }
+}
+@keyframes rotate_630_2 {
+    0% {
+      transform: rotate(150deg)
+    }
+    10% {
+        transform: rotate(150deg)
+    }
+    50% {
+        transform: rotate(70deg)
+    }
+    60% {
+        transform: rotate(70deg)
+    }
+    90% {
+        transform: rotate(15deg)
+    }
+    100% {
+        transform: rotate(15deg)
+    }
+}
 </style>
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 1ad9ce3..8928554 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -1,7 +1,7 @@
 import * as types from '../types'
 import { getStore, setStore } from '@js/mUtils.js'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.107:8080/hlapp' : 'http://192.168.46.5:8080/hl_nlapp'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.59:8080' : 'http://192.168.46.5:8080/hl_nlapp'
 
 /**
  * App通用配置