From 4ba360f1ef211aded0c7f233472e96a78c00764c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 3 Sep 2024 19:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=89=80=E4=BB=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                  |  18 +-
 src/config/mork2.js                     | 828 ++++++++++++------------
 src/pages_960/modules/home/index.vue    | 328 +---------
 src/pages_960/modules/home/style.stylus | 234 +++++++
 4 files changed, 676 insertions(+), 732 deletions(-)
 create mode 100644 src/pages_960/modules/home/style.stylus

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 7f81699..20110b2 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -1,17 +1,3 @@
 import {post} from './http.js'
-// 原料库存
-export const inventoryAnalysis = () => post('api/bigScreen/inventoryAnalysis', {})
-// 当日出入
-export const inventoryIOAnalysis = () => post('api/bigScreen/inventoryIOAnalysis', {})
-// 历史分析
-export const historyInventoryIOAnalysis = () => post('api/bigScreen/historyInventoryIOAnalysis', {})
-// 当日生产统计
-export const todayProduceStatistic = () => post('api/bigScreen/todayProduceStatistic', {})
-// 当日车间上下料
-export const todayLoadingAndUnloadingStatistics = () => post('api/bigScreen/todayLoadingAndUnloadingStatistics', {})
-// 当日搬运任务
-export const todayTask = () => post('api/bigScreen/todayTask', {})
-// AGV信息
-export const agvInfo = () => post('api/bigScreen/agvInfo', {})
-// RGV信息
-export const rgvInfo = () => post('api/bigScreen/rgvInfo', {})
+// 获取大屏所有数据
+export const getAllBigScreen = () => post('api/bigScreen/getAllBigScreen', {})
diff --git a/src/config/mork2.js b/src/config/mork2.js
index ff1f345..fe9b59f 100644
--- a/src/config/mork2.js
+++ b/src/config/mork2.js
@@ -1,414 +1,420 @@
 /* eslint-disable */
-export const inventoryAnalysis = () => {
-  let res = [
-      {
-          "total_material_qty": 50.0,
-          "percentage": "33.33%",
-          "material_id": "1759155580745945088",
-          "material_name": "测试物料2",
-          "material_code": "A1002"
-      },
-      {
-          "total_material_qty": 100.0,
-          "percentage": "66.67%",
-          "material_id": "1759154624864063488",
-          "material_name": "测试物料",
-          "material_code": "A1001"
-      }
-  ]
-  return res
-}
-export const inventoryIOAnalysis = () => {
-  let res = [
-    {
-        "total_outstorage_qty": 0.0,
-        "total_instorage_qty": 100.0,
-        "material_id": "1759154624864063488",
-        "material_name": "测试物料",
-        "material_code": "A1001"
-    },
-    {
-        "total_outstorage_qty": 28.0,
-        "total_instorage_qty": 78.0,
-        "material_id": "1759155580745945088",
-        "material_name": "测试物料2",
-        "material_code": "A1002"
+export const getAllBigScreen = () => {
+    let res = {
+        inventoryAnalysis: [
+            {
+                "total_material_qty": 50.0,
+                "percentage": "33.33%",
+                "material_id": "1759155580745945088",
+                "material_name": "测试物料2",
+                "material_code": "A1002"
+            },
+            {
+                "total_material_qty": 100.0,
+                "percentage": "66.67%",
+                "material_id": "1759154624864063488",
+                "material_name": "测试物料",
+                "material_code": "A1001"
+            }
+        ],
+        agvInfo: [
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV01",
+                "target_loc": "0",
+                "device_code": "RGV01",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV02",
+                "target_loc": "0",
+                "device_code": "RGV02",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV04",
+                "target_loc": "0",
+                "device_code": "RGV04",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV03",
+                "target_loc": "0",
+                "device_code": "RGV03",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            }
+        ],
+        rgvInfo: [
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV01",
+                "target_loc": "0",
+                "device_code": "RGV01",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV02",
+                "target_loc": "0",
+                "device_code": "RGV02",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV04",
+                "target_loc": "0",
+                "device_code": "RGV04",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            },
+            {
+                "current_loc": "0",
+                "battery_level": "0.0%",
+                "heartbeat": 0,
+                "task_code": 0,
+                "vehicleCode": null,
+                "allTaskNum": 0,
+                "error": 0,
+                "todayTaskNum": 0,
+                "message": "运行异常",
+                "mode": "未知",
+                "device_name": "RGV03",
+                "target_loc": "0",
+                "device_code": "RGV03",
+                "x": null,
+                "y": null,
+                "action": 0,
+                "status": "休息中"
+            }
+        ],
+        todayProduceStatistic: [
+            {
+                "count": 0,
+                "region_name": "备成型壳制备区",
+                "region_code": "BCXKZB"
+            },
+            {
+                "count": 0,
+                "region_name": "型壳焙烧区",
+                "region_code": "XKBS"
+            },
+            {
+                "count": 0,
+                "region_name": "蒸汽脱蜡区",
+                "region_code": "ZQTL"
+            }
+        ],
+        inventoryIOAnalysis: [
+            {
+                "total_outstorage_qty": 0.0,
+                "total_instorage_qty": 100.0,
+                "material_id": "1759154624864063488",
+                "material_name": "测试物料",
+                "material_code": "A1001"
+            },
+            {
+                "total_outstorage_qty": 28.0,
+                "total_instorage_qty": 78.0,
+                "material_id": "1759155580745945088",
+                "material_name": "测试物料2",
+                "material_code": "A1002"
+            }
+        ],
+        historyInventoryIOAnalysis: [
+            {
+                "total_outstorage_qty": 0.0,
+                "data": "08-01",
+                "total_instorage_qty": 0.0
+            },
+            {
+                "total_outstorage_qty": 1.0,
+                "data": "08-02",
+                "total_instorage_qty": 0.0
+            },
+            {
+                "total_outstorage_qty": 0.0,
+                "data": "08-03",
+                "total_instorage_qty": 0.0
+            },
+            {
+                "total_outstorage_qty": 0.0,
+                "data": "08-04",
+                "total_instorage_qty": 0.0
+            },
+            {
+                "total_outstorage_qty": 0.0,
+                "data": "08-05",
+                "total_instorage_qty": 0.0
+            },
+            {
+                "total_outstorage_qty": 6.0,
+                "data": "08-06",
+                "total_instorage_qty": 6.0
+            },
+            {
+                "total_outstorage_qty": 28.0,
+                "data": "08-07",
+                "total_instorage_qty": 178.0
+            }
+        ],
+        todayTask: [
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:19:10",
+                "carno": "",
+                "task_code": "1821053300573868033",
+                "next_point_code": "01-01-01",
+                "start_point_code": "CKDJ1"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:13:46",
+                "carno": "",
+                "task_code": "1821051936523292673",
+                "next_point_code": "RKDJ2",
+                "start_point_code": "01-01-02"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:16:10",
+                "carno": "",
+                "task_code": "1821052566008631297",
+                "next_point_code": "01-01-02",
+                "start_point_code": "RKDJ2"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:19:00",
+                "carno": "",
+                "task_code": "1821053354068021249",
+                "next_point_code": "01-01-02",
+                "start_point_code": "CKDJ2"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:16:20",
+                "carno": "",
+                "task_code": "1821052576351784961",
+                "next_point_code": "01-01-03",
+                "start_point_code": "RKDJ1"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:10:35",
+                "carno": "AMB-02",
+                "task_code": "1821050896554004481",
+                "next_point_code": "01-02-02",
+                "start_point_code": "RKDJ5"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:17:52",
+                "carno": "",
+                "task_code": "1821053001335443457",
+                "next_point_code": "CKDJ2",
+                "start_point_code": "01-01-02"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:10:15",
+                "carno": "AMB-01",
+                "task_code": "1821050807915778049",
+                "next_point_code": "01-01-03",
+                "start_point_code": "RKDJ3"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:13:56",
+                "carno": "",
+                "task_code": "1821051969201115137",
+                "next_point_code": "RKDJ3",
+                "start_point_code": "01-01-03"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:10:05",
+                "carno": "AMB-01",
+                "task_code": "1821050760486588417",
+                "next_point_code": "01-01-02",
+                "start_point_code": "RKDJ2"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:10:25",
+                "carno": "AMB-02",
+                "task_code": "1821050853545611265",
+                "next_point_code": "01-02-01",
+                "start_point_code": "RKDJ4"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:13:36",
+                "carno": "",
+                "task_code": "1821051901286944769",
+                "next_point_code": "RKDJ1",
+                "start_point_code": "01-01-01"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:17:42",
+                "carno": "",
+                "task_code": "1821052983480291329",
+                "next_point_code": "CKDJ1",
+                "start_point_code": "01-01-01"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:16:00",
+                "carno": "",
+                "task_code": "1821052554327494657",
+                "next_point_code": "01-01-01",
+                "start_point_code": "RKDJ3"
+            },
+            {
+                "task_status": "完成",
+                "create_time": "2024-08-07 13:09:55",
+                "carno": "AMB-01",
+                "task_code": "1821050707009212417",
+                "next_point_code": "01-01-01",
+                "start_point_code": "RKDJ1"
+            }
+        ],
+        todayLoadingAndUnloadingStatistics: [
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "2F面层制壳间",
+                "region_code": "2FMCZKJ"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "3F蜡模组树区",
+                "region_code": "3FLMZS"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "备成型壳制备区",
+                "region_code": "BCXKZB"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "蜡模制备区",
+                "region_code": "LMZB"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "蜡模组盘区",
+                "region_code": "LMZP"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "型壳焙烧区",
+                "region_code": "XKBS"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "自动制壳区",
+                "region_code": "ZDZK"
+            },
+            {
+                "material_loading_count": 0,
+                "material_unloading_count": 0,
+                "region_name": "蒸汽脱蜡区",
+                "region_code": "ZQTL"
+            }
+        ]
     }
-]
-  return res
-}
-export const historyInventoryIOAnalysis = () => {
-  let res = [
-      {
-          "total_outstorage_qty": 0.0,
-          "data": "08-01",
-          "total_instorage_qty": 0.0
-      },
-      {
-          "total_outstorage_qty": 1.0,
-          "data": "08-02",
-          "total_instorage_qty": 0.0
-      },
-      {
-          "total_outstorage_qty": 0.0,
-          "data": "08-03",
-          "total_instorage_qty": 0.0
-      },
-      {
-          "total_outstorage_qty": 0.0,
-          "data": "08-04",
-          "total_instorage_qty": 0.0
-      },
-      {
-          "total_outstorage_qty": 0.0,
-          "data": "08-05",
-          "total_instorage_qty": 0.0
-      },
-      {
-          "total_outstorage_qty": 6.0,
-          "data": "08-06",
-          "total_instorage_qty": 6.0
-      },
-      {
-          "total_outstorage_qty": 28.0,
-          "data": "08-07",
-          "total_instorage_qty": 178.0
-      }
-  ]
-  return res
-}
-export const todayProduceStatistic = () => {
-  let res = [
-      {
-          "count": 0,
-          "region_name": "备成型壳制备区",
-          "region_code": "BCXKZB"
-      },
-      {
-          "count": 0,
-          "region_name": "型壳焙烧区",
-          "region_code": "XKBS"
-      },
-      {
-          "count": 0,
-          "region_name": "蒸汽脱蜡区",
-          "region_code": "ZQTL"
-      }
-  ]
-  return res
-}
-export const todayLoadingAndUnloadingStatistics = () => {
-  let res = [
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "2F面层制壳间",
-          "region_code": "2FMCZKJ"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "3F蜡模组树区",
-          "region_code": "3FLMZS"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "备成型壳制备区",
-          "region_code": "BCXKZB"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "蜡模制备区",
-          "region_code": "LMZB"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "蜡模组盘区",
-          "region_code": "LMZP"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "型壳焙烧区",
-          "region_code": "XKBS"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "自动制壳区",
-          "region_code": "ZDZK"
-      },
-      {
-          "material_loading_count": 0,
-          "material_unloading_count": 0,
-          "region_name": "蒸汽脱蜡区",
-          "region_code": "ZQTL"
-      }
-  ]
-  return res
-}
-export const todayTask = () => {
-  let res = [
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:19:10",
-          "carno": "",
-          "task_code": "1821053300573868033",
-          "next_point_code": "01-01-01",
-          "start_point_code": "CKDJ1"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:13:46",
-          "carno": "",
-          "task_code": "1821051936523292673",
-          "next_point_code": "RKDJ2",
-          "start_point_code": "01-01-02"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:16:10",
-          "carno": "",
-          "task_code": "1821052566008631297",
-          "next_point_code": "01-01-02",
-          "start_point_code": "RKDJ2"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:19:00",
-          "carno": "",
-          "task_code": "1821053354068021249",
-          "next_point_code": "01-01-02",
-          "start_point_code": "CKDJ2"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:16:20",
-          "carno": "",
-          "task_code": "1821052576351784961",
-          "next_point_code": "01-01-03",
-          "start_point_code": "RKDJ1"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:10:35",
-          "carno": "AMB-02",
-          "task_code": "1821050896554004481",
-          "next_point_code": "01-02-02",
-          "start_point_code": "RKDJ5"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:17:52",
-          "carno": "",
-          "task_code": "1821053001335443457",
-          "next_point_code": "CKDJ2",
-          "start_point_code": "01-01-02"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:10:15",
-          "carno": "AMB-01",
-          "task_code": "1821050807915778049",
-          "next_point_code": "01-01-03",
-          "start_point_code": "RKDJ3"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:13:56",
-          "carno": "",
-          "task_code": "1821051969201115137",
-          "next_point_code": "RKDJ3",
-          "start_point_code": "01-01-03"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:10:05",
-          "carno": "AMB-01",
-          "task_code": "1821050760486588417",
-          "next_point_code": "01-01-02",
-          "start_point_code": "RKDJ2"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:10:25",
-          "carno": "AMB-02",
-          "task_code": "1821050853545611265",
-          "next_point_code": "01-02-01",
-          "start_point_code": "RKDJ4"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:13:36",
-          "carno": "",
-          "task_code": "1821051901286944769",
-          "next_point_code": "RKDJ1",
-          "start_point_code": "01-01-01"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:17:42",
-          "carno": "",
-          "task_code": "1821052983480291329",
-          "next_point_code": "CKDJ1",
-          "start_point_code": "01-01-01"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:16:00",
-          "carno": "",
-          "task_code": "1821052554327494657",
-          "next_point_code": "01-01-01",
-          "start_point_code": "RKDJ3"
-      },
-      {
-          "task_status": "完成",
-          "create_time": "2024-08-07 13:09:55",
-          "carno": "AMB-01",
-          "task_code": "1821050707009212417",
-          "next_point_code": "01-01-01",
-          "start_point_code": "RKDJ1"
-      }
-  ]
-  return res
-}
-export const agvInfo = () => {
-  let res = [
-      {
-          "battery_level": "0.0%",
-          "task_code": "0",
-          "todayTaskNum": 0,
-          "message": "运行正常",
-          "monthTaskNum": 1,
-          "device_name": "AMB-03",
-          "today_odo": 0.0,
-          "device_code": "AMB-03",
-          "x": 0.0,
-          "angle": 0.0,
-          "y": 0.0,
-          "time": 0.0,
-          "odo": 0,
-          "total_time": 0.0,
-          "status": "未知状态"
-      },
-      {
-          "battery_level": "0.0%",
-          "task_code": "0",
-          "todayTaskNum": 2,
-          "message": "运行正常",
-          "monthTaskNum": 4,
-          "device_name": "AMB-02",
-          "today_odo": 0.0,
-          "device_code": "AMB-02",
-          "x": 0.0,
-          "angle": 0.0,
-          "y": 0.0,
-          "time": 0.0,
-          "odo": 0,
-          "total_time": 0.0,
-          "status": "未知状态"
-      },
-      {
-          "battery_level": "0.0%",
-          "task_code": "0",
-          "todayTaskNum": 5,
-          "message": "运行正常",
-          "monthTaskNum": 7,
-          "device_name": "AMB-01",
-          "today_odo": 0.0,
-          "device_code": "AMB-01",
-          "x": 0.0,
-          "angle": 0.0,
-          "y": 0.0,
-          "time": 0.0,
-          "odo": 0,
-          "total_time": 0.0,
-          "status": "未知状态"
-      }
-  ]
-  return res
-}
-export const rgvInfo = () => {
-  let res = [
-      {
-          "current_loc": "0",
-          "battery_level": "0.0%",
-          "heartbeat": 0,
-          "task_code": 0,
-          "vehicleCode": null,
-          "allTaskNum": 0,
-          "error": 0,
-          "todayTaskNum": 0,
-          "message": "运行异常",
-          "mode": "未知",
-          "device_name": "RGV01",
-          "target_loc": "0",
-          "device_code": "RGV01",
-          "x": null,
-          "y": null,
-          "action": 0,
-          "status": "休息中"
-      },
-      {
-          "current_loc": "0",
-          "battery_level": "0.0%",
-          "heartbeat": 0,
-          "task_code": 0,
-          "vehicleCode": null,
-          "allTaskNum": 0,
-          "error": 0,
-          "todayTaskNum": 0,
-          "message": "运行异常",
-          "mode": "未知",
-          "device_name": "RGV02",
-          "target_loc": "0",
-          "device_code": "RGV02",
-          "x": null,
-          "y": null,
-          "action": 0,
-          "status": "休息中"
-      },
-      {
-          "current_loc": "0",
-          "battery_level": "0.0%",
-          "heartbeat": 0,
-          "task_code": 0,
-          "vehicleCode": null,
-          "allTaskNum": 0,
-          "error": 0,
-          "todayTaskNum": 0,
-          "message": "运行异常",
-          "mode": "未知",
-          "device_name": "RGV04",
-          "target_loc": "0",
-          "device_code": "RGV04",
-          "x": null,
-          "y": null,
-          "action": 0,
-          "status": "休息中"
-      },
-      {
-          "current_loc": "0",
-          "battery_level": "0.0%",
-          "heartbeat": 0,
-          "task_code": 0,
-          "vehicleCode": null,
-          "allTaskNum": 0,
-          "error": 0,
-          "todayTaskNum": 0,
-          "message": "运行异常",
-          "mode": "未知",
-          "device_name": "RGV03",
-          "target_loc": "0",
-          "device_code": "RGV03",
-          "x": null,
-          "y": null,
-          "action": 0,
-          "status": "休息中"
-      }
-  ]
-  return res
+    return res
 }
diff --git a/src/pages_960/modules/home/index.vue b/src/pages_960/modules/home/index.vue
index 2bdc7a3..612392d 100644
--- a/src/pages_960/modules/home/index.vue
+++ b/src/pages_960/modules/home/index.vue
@@ -177,8 +177,8 @@
 </template>
 
 <script>
-// import { inventoryAnalysis, inventoryIOAnalysis, historyInventoryIOAnalysis, todayProduceStatistic, todayLoadingAndUnloadingStatistics, todayTask, agvInfo, rgvInfo } from '@js/mork2.js'
-import { inventoryAnalysis, inventoryIOAnalysis, historyInventoryIOAnalysis, todayProduceStatistic, todayLoadingAndUnloadingStatistics, todayTask, agvInfo, rgvInfo } from '@js/getData2.js'
+// import { getAllBigScreen } from '@js/mork2.js'
+import { getAllBigScreen } from '@js/getData2.js'
 export default {
   data () {
     return {
@@ -248,63 +248,32 @@ export default {
       this.$router.push('/setup')
     },
     refresh () {
-      this._inventoryAnalysis()
-      this._inventoryIOAnalysis()
-      this._historyInventoryIOAnalysis()
-      this._todayProduceStatistic()
-      this._todayLoadingAndUnloadingStatistics()
-      this._todayTask()
-      this._agvInfo()
-      this._rgvInfo()
+      this._getAllBigScreen()
       this.timer = setInterval(() => {
-        this._inventoryAnalysis()
-        this._inventoryIOAnalysis()
-        this._historyInventoryIOAnalysis()
-        this._todayProduceStatistic()
-        this._todayLoadingAndUnloadingStatistics()
-        this._todayTask()
-        this._agvInfo()
-        this._rgvInfo()
+        this._getAllBigScreen()
       }, this.interTime)
     },
-    async _inventoryAnalysis () {
-      let res = await inventoryAnalysis()
+    async _getAllBigScreen () {
+      let res = await getAllBigScreen()
       clearInterval(this.chart1Timer)
+      clearInterval(this.chart2Timer)
+      clearInterval(this.chart5Timer)
       this.chart1Timer = null
-      this.materList = [...res]
+      this.chart2Timer = null
+      this.chart5Timer = null
+      this.materList = [...res.inventoryAnalysis]
+      this.curList = [...res.inventoryIOAnalysis]
+      this.historyList = [...res.historyInventoryIOAnalysis]
+      this.statisList = [...res.todayProduceStatistic]
+      this.loadList = [...res.todayLoadingAndUnloadingStatistics]
+      this.taskList = [...res.todayTask]
+      this.agvList = [...res.agvInfo]
+      this.rgvList = [...res.rgvInfo]
       this.setEchart1()
-    },
-    async _inventoryIOAnalysis () {
-      let res = await inventoryIOAnalysis()
-      if (res.length) {
-        clearInterval(this.chart2Timer)
-        this.chart2Timer = null
-        this.curList = [...res]
-        this.setEchart2()
-      }
-    },
-    async _historyInventoryIOAnalysis () {
-      let res = await historyInventoryIOAnalysis()
-      if (res.length) {
-        this.historyList = [...res]
-        this.setEchart3()
-      }
-    },
-    async _todayProduceStatistic () {
-      let res = await todayProduceStatistic()
-      if (res.length) {
-        this.statisList = [...res]
-        this.setEchart4()
-      }
-    },
-    async _todayLoadingAndUnloadingStatistics () {
-      let res = await todayLoadingAndUnloadingStatistics()
-      if (res.length) {
-        clearInterval(this.chart5Timer)
-        this.chart5Timer = null
-        this.loadList = [...res]
-        this.setEchart5()
-      }
+      this.setEchart2()
+      this.setEchart3()
+      this.setEchart4()
+      this.setEchart5()
     },
     setEchart1 () {
       let colors = ['#1980EA', '#67D470', '#B4C9EF', '#BCBF5C', '#EF5252', '#6d5edd', '#bf41bb']
@@ -1022,262 +991,11 @@ export default {
       window.addEventListener('resize', () => {
         echart.resize()
       })
-    },
-    async _todayTask () {
-      let res = await todayTask()
-      if (res.length) {
-        this.taskList = [...res]
-      }
-    },
-    async _agvInfo () {
-      let res = await agvInfo()
-      if (res.length) {
-        this.agvList = [...res]
-      }
-    },
-    async _rgvInfo () {
-      let res = await rgvInfo()
-      if (res.length) {
-        this.rgvList = [...res]
-      }
     }
   }
 }
 </script>
 
 <style lang="stylus" scoped>
-.n_container
-  position relative
-  width 100%
-  height 100%
-  overflow hidden
-.n_header
-  position absolute
-  left 0
-  top 0
-  width 100%
-  height 88px
-  background center / 100% url('../../../images/header_bg_s.png') no-repeat
-.n_header_h1
-  width: 100%;
-  height: 100%;
-  padding-top 12px
-  h1
-      font-size: 22px;
-      font-weight: 700;
-      color: #fff;
-      line-height: 1;
-      text-align center;
-      letter-spacing 4px
-.exit_btn
-  position absolute
-  left 3%
-  top 11%
-  z-index 100
-  height 16px
-  width 16px
-  line-height 16px
-  font-size 16px
-  color #AECAF5
-  text-align: center;
-.n_body_container
-  width 100%
-  height 100%
-  padding 60px 10px 10px 10px
-  display: flex;
-  justify-content: space-between;
-.n_left_wraper
-  width 24%
-  height 100%
-.n_right_wraper
-  width 24%
-  height 100%
-.n-center_wraper
-  width 50%
-  height 100%
-.w_wraper
-  width 100%
-  height 100%
-.item_wraper
-  width 100%
-  height calc((100% - 20px) / 3)
-  margin-bottom 10px
-  &:last-child
-    margin-bottom 0
-.item_wraper_1
-  height calc((200% - 20px) / 3)
-.title_wraper
-  width 100%
-  height 24px
-  background center / 100% 100% url('../../../images/bg-title_2_s.png') no-repeat
-  padding 2px 22px
-  p
-    font-size 12px
-    font-weight: 400;
-    color: #fff;
-    line-height 8px
-.title_wraper_1
-  background-image url('../../../images/bg-title_1_s.png')
-.content_wraper
-  width 100%
-  height calc(100% - 24px)
-  padding 8px
-  background-color rgba(30, 65, 126, 70%)
-.content_wraper_2
-  padding 0
-.pie_wraper
-  width 100%
-  height 100%
-  padding 1px 0 0 1px
-  background left center / 111px 111px url('../../../images/pie-bg_2_s.png') no-repeat
-.pie_legend
-  width calc(100% - 200px)
-  height 100%
-  margin-left 200px
-  display flex
-  flex-direction row
-  justify-content space-between
-  align-items center
-  flex-wrap: wrap
-.scroll_wrap
-    width 100%
-    height 100%
-    padding 5px 10px 2px 10px
-.scroll_tab_1
-  width 100%
-  height 20px
-  background center / 100% 100% url('../../../images/table-bg_1.png') no-repeat
-  li
-    float left
-    width 15%
-    font-size 10px;
-    line-height 20px
-    color #AFBED8
-    text-align center
-    font-weight: bold;
-    font-style: italic;
-    word-wrap break-word
-    word-break break-all
-    white-space nowrap
-    padding 0 2px
-    overflow hidden
-    box-sizing border-box
-    &:nth-child(1), &:nth-child(5)
-      width 20%
-    .state
-      display block
-      width 20px
-      height 14px
-    .state_name
-      width calc(100% - 20px)
-.scroll_container_1
-  width 100%
-  height calc(100% - 20px)
-  overflow hidden
-.scroll-ul_1
-  li
-    width 100%
-    height 20px
-    border-bottom 1px solid rgba(122,159,224,0.17)
-    &:nth-child(even)
-      background rgba(31,46,73,0.7)
-    &:nth-child(odd)
-      background rgba(31,46,73,0.55)
-    .scroll-ul_1_div
-      float left
-      width 15%
-      height 20px
-      display flex
-      flex-direction row
-      justify-content center
-      align-items center
-      flex-wrap nowrap
-      font-size 8px
-      line-height 8px
-      color #B2BBD7
-      text-align center
-      // word-wrap break-word
-      // word-break break-all
-      white-space nowrap
-      padding 0 1px
-      overflow hidden
-      &:nth-child(1), &:nth-child(5)
-        width 20%
-      .state
-        display block
-        width 20px
-        height 14px
-      .state_name
-        width 100%
-        height 20px
-.agv_wrap
-  display flex
-  justify-content space-between
-  width 100%
-  height 47%
-  padding-bottom 10px
-.rgv_wrap
-  height 53%
-  padding-bottom 0
-.agv_item
-  display: flex;
-  justify-content: space-between;
-  width 32%
-  padding 5px
-  border 1px solid #3AA2F2
-  border-radius 4px
-  box-shadow inset 0px 0px 3px 3px rgba(58, 162, 242, 40%)
-.rgv_item
-  display: block
-  width 24%
-.agv_left
-  width 33%
-  height 100%
-  padding-bottom 8px
-.rgv_left
-  width 100%
-  height 20%
-  padding 0
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-.agv_img
-  height calc(100% - 30px)
-  background center center / 80% auto url('../../../images/agv_s.png') no-repeat
-.agv_info
-  width 64%
-.p1
-  height 30px
-  font-size: 9px;
-  line-height 30px
-  color: #78B1DE;
-  text-align: center;
-  white-space nowrap
-.agv_txt
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height 20%
-  background bottom center / 100% 3px url('../../../images/screen1/line_1.png') no-repeat
-  &:last-child
-    background none
-.p2
-  font-size: 6px;
-  color: #84B0DA;
-  text-align: center;
-  font-weight: 700;
-.p3
-  font-size: 8px;
-  color: #FFFFFF;
-  text-align: center;
-  font-weight: 700;
-.rgv_img
-  width 50%
-  height 100%
-  background center center / 80% auto url('../../../images/rgv_s.png') no-repeat
-  margin-bottom 0
-.rgv_info
-  height 80%
-.rgv_txt
-  height 20%
+@import './style.stylus'
 </style>
diff --git a/src/pages_960/modules/home/style.stylus b/src/pages_960/modules/home/style.stylus
new file mode 100644
index 0000000..6e43e16
--- /dev/null
+++ b/src/pages_960/modules/home/style.stylus
@@ -0,0 +1,234 @@
+.n_container
+  position relative
+  width 100%
+  height 100%
+  overflow hidden
+.n_header
+  position absolute
+  left 0
+  top 0
+  width 100%
+  height 88px
+  background center / 100% url('../../../images/header_bg_s.png') no-repeat
+.n_header_h1
+  width: 100%;
+  height: 100%;
+  padding-top 12px
+  h1
+      font-size: 22px;
+      font-weight: 700;
+      color: #fff;
+      line-height: 1;
+      text-align center;
+      letter-spacing 4px
+.exit_btn
+  position absolute
+  left 3%
+  top 11%
+  z-index 100
+  height 16px
+  width 16px
+  line-height 16px
+  font-size 16px
+  color #AECAF5
+  text-align: center;
+.n_body_container
+  width 100%
+  height 100%
+  padding 60px 10px 10px 10px
+  display: flex;
+  justify-content: space-between;
+.n_left_wraper
+  width 24%
+  height 100%
+.n_right_wraper
+  width 24%
+  height 100%
+.n-center_wraper
+  width 50%
+  height 100%
+.w_wraper
+  width 100%
+  height 100%
+.item_wraper
+  width 100%
+  height calc((100% - 20px) / 3)
+  margin-bottom 10px
+  &:last-child
+    margin-bottom 0
+.item_wraper_1
+  height calc((200% - 20px) / 3)
+.title_wraper
+  width 100%
+  height 24px
+  background center / 100% 100% url('../../../images/bg-title_2_s.png') no-repeat
+  padding 2px 22px
+  p
+    font-size 12px
+    font-weight: 400;
+    color: #fff;
+    line-height 8px
+.title_wraper_1
+  background-image url('../../../images/bg-title_1_s.png')
+.content_wraper
+  width 100%
+  height calc(100% - 24px)
+  padding 8px
+  background-color rgba(30, 65, 126, 70%)
+.content_wraper_2
+  padding 0
+.pie_wraper
+  width 100%
+  height 100%
+  padding 1px 0 0 1px
+  background left center / 111px 111px url('../../../images/pie-bg_2_s.png') no-repeat
+.pie_legend
+  width calc(100% - 200px)
+  height 100%
+  margin-left 200px
+  display flex
+  flex-direction row
+  justify-content space-between
+  align-items center
+  flex-wrap: wrap
+.scroll_wrap
+    width 100%
+    height 100%
+    padding 5px 10px 2px 10px
+.scroll_tab_1
+  width 100%
+  height 20px
+  background center / 100% 100% url('../../../images/table-bg_1.png') no-repeat
+  li
+    float left
+    width 15%
+    font-size 10px;
+    line-height 20px
+    color #AFBED8
+    text-align center
+    font-weight: bold;
+    font-style: italic;
+    word-wrap break-word
+    word-break break-all
+    white-space nowrap
+    padding 0 2px
+    overflow hidden
+    box-sizing border-box
+    &:nth-child(1), &:nth-child(5)
+      width 20%
+    .state
+      display block
+      width 20px
+      height 14px
+    .state_name
+      width calc(100% - 20px)
+.scroll_container_1
+  width 100%
+  height calc(100% - 20px)
+  overflow hidden
+.scroll-ul_1
+  li
+    width 100%
+    height 20px
+    border-bottom 1px solid rgba(122,159,224,0.17)
+    &:nth-child(even)
+      background rgba(31,46,73,0.7)
+    &:nth-child(odd)
+      background rgba(31,46,73,0.55)
+    .scroll-ul_1_div
+      float left
+      width 15%
+      height 20px
+      display flex
+      flex-direction row
+      justify-content center
+      align-items center
+      flex-wrap nowrap
+      font-size 8px
+      line-height 8px
+      color #B2BBD7
+      text-align center
+      // word-wrap break-word
+      // word-break break-all
+      white-space nowrap
+      padding 0 1px
+      overflow hidden
+      &:nth-child(1), &:nth-child(5)
+        width 20%
+      .state
+        display block
+        width 20px
+        height 14px
+      .state_name
+        width 100%
+        height 20px
+.agv_wrap
+  display flex
+  justify-content space-between
+  width 100%
+  height 47%
+  padding-bottom 10px
+.rgv_wrap
+  height 53%
+  padding-bottom 0
+.agv_item
+  display: flex;
+  justify-content: space-between;
+  width 32%
+  padding 5px
+  border 1px solid #3AA2F2
+  border-radius 4px
+  box-shadow inset 0px 0px 3px 3px rgba(58, 162, 242, 40%)
+.rgv_item
+  display: block
+  width 24%
+.agv_left
+  width 33%
+  height 100%
+  padding-bottom 8px
+.rgv_left
+  width 100%
+  height 20%
+  padding 0
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+.agv_img
+  height calc(100% - 30px)
+  background center center / 80% auto url('../../../images/agv_s.png') no-repeat
+.agv_info
+  width 64%
+.p1
+  height 30px
+  font-size: 9px;
+  line-height 30px
+  color: #78B1DE;
+  text-align: center;
+  white-space nowrap
+.agv_txt
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height 20%
+  background bottom center / 100% 3px url('../../../images/screen1/line_1.png') no-repeat
+  &:last-child
+    background none
+.p2
+  font-size: 6px;
+  color: #84B0DA;
+  text-align: center;
+  font-weight: 700;
+.p3
+  font-size: 8px;
+  color: #FFFFFF;
+  text-align: center;
+  font-weight: 700;
+.rgv_img
+  width 50%
+  height 100%
+  background center center / 80% auto url('../../../images/rgv_s.png') no-repeat
+  margin-bottom 0
+.rgv_info
+  height 80%
+.rgv_txt
+  height 20%
\ No newline at end of file