From f7d88ab2b0e497adf06faf91ad581a22938e3d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 4 Dec 2024 14:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/api/board/firstFloorProduction.js   | 17 ++++++++
 hw-ui/src/api/board/firstFloorWarehouse.js    | 40 +++---------------
 .../src/views/board/production/firstFloor.vue | 41 ++++++-------------
 .../src/views/board/warehouse/firstFloor.vue  | 13 +++---
 4 files changed, 43 insertions(+), 68 deletions(-)
 create mode 100644 hw-ui/src/api/board/firstFloorProduction.js

diff --git a/hw-ui/src/api/board/firstFloorProduction.js b/hw-ui/src/api/board/firstFloorProduction.js
new file mode 100644
index 00000000..dd8aaa2b
--- /dev/null
+++ b/hw-ui/src/api/board/firstFloorProduction.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function elevatorStatus(query) {
+  return request({
+    url: 'mes/firstMesBorder/elevatorStatus',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getProductOrders(query) {
+  return request({
+    url: 'mes/firstMesBorder/getProductOrders',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/hw-ui/src/api/board/firstFloorWarehouse.js b/hw-ui/src/api/board/firstFloorWarehouse.js
index 30ff59d1..9f7f4983 100644
--- a/hw-ui/src/api/board/firstFloorWarehouse.js
+++ b/hw-ui/src/api/board/firstFloorWarehouse.js
@@ -1,46 +1,16 @@
-import request from '@/utils/request1'
-import request1 from '@/utils/request2'
+import request from '@/utils/request'
 
-// 出入库详情
-export function inAndOutInfo(query) {
+export function energyFirstFloorData(query) {
   return request({
-    url: '/FirstWmsBorder/inAndOutInfo',
+    url: 'ems/EmsBoard/energyFirstFloorData',
     method: 'get',
     params: query
   })
 }
 
-// 原材料库存占比
-export function stockPercentage(query) {
+export function getEnergyHistoryData(query) {
   return request({
-    url: '/FirstWmsBorder/stockPercentage',
-    method: 'get',
-    params: query
-  })
-}
-
-// 采购订单
-export function purchaseInfo(query) {
-  return request({
-    url: '/FirstWmsBorder/purchaseInfo',
-    method: 'get',
-    params: query
-  })
-}
-
-// 生产订单物料需求
-export function bomInfo(query) {
-  return request({
-    url: '/FirstWmsBorder/bomInfo',
-    method: 'get',
-    params: query
-  })
-}
-
-// 成品出入库
-export function productInAndOutInfo(query) {
-  return request({
-    url: '/FirstWmsBorder/productInAndOutInfo',
+    url: 'ems/EmsBoard/getEnergyHistoryData',
     method: 'get',
     params: query
   })
diff --git a/hw-ui/src/views/board/production/firstFloor.vue b/hw-ui/src/views/board/production/firstFloor.vue
index 55fd5303..5bed3c5a 100644
--- a/hw-ui/src/views/board/production/firstFloor.vue
+++ b/hw-ui/src/views/board/production/firstFloor.vue
@@ -35,17 +35,17 @@
             <div
               class="scrollTableItem" style="width: 33%"
             >
-              {{ item.data1 }}F
+              {{ item.currPointId }}F
             </div>
             <div
               class="scrollTableItem" style="width: 33%"
             >
-              {{ item.data2 }}F
+              {{ item.endPointId }}F
             </div>
             <div
               class="scrollTableItem" style="width: 33%"
             >
-              {{ item.data3 }}
+              {{ item.taskStatusStr }}
             </div>
           </div>
         </div>
@@ -154,6 +154,7 @@ import {
   workOrderProgress
 } from '@/api/board/secondFloorProduction'
 import { parseTime } from '@/utils/ruoyi'
+import { elevatorStatus, getProductOrders } from '@/api/board/firstFloorProduction'
 
 const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
@@ -164,12 +165,7 @@ export default {
   },
   data() {
     return {
-      tsjData: {
-        'currentFloor': '3',
-        'targetFloor': '3',
-        'elevatorStatus': '空闲',
-        'wcsTaskList': []
-      },
+      tsjData: {},
       LineStatus: true,
       topData: {
         planAmount: [0, 0, 0, 0],
@@ -236,23 +232,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0
       },
-      scrollTableData1:[
-        {
-          data1:1,
-          data2:3,
-          data3:'完成',
-        },
-        {
-          data1:1,
-          data2:3,
-          data3:'取消',
-        },
-        {
-          data1:2,
-          data2:3,
-          data3:'完成',
-        },
-      ],
+      scrollTableData1:[],
       scrollTableData: [ {
         "createBy": "admin",
         "createTime": "2024-11-24 20:11:12",
@@ -317,9 +297,14 @@ export default {
   },
   methods: {
     getData() {
-      workOrderProgress().then(e => {
+      elevatorStatus().then(e=>{
+        this.tsjData = e.data
+        this.scrollTableData1 = e.data?.wcsTaskList
+      })
+      getProductOrders().then(e=>{
+        console.log(e)
+        this.scrollTableData = e.rows
       })
-
     }
   }
 }
diff --git a/hw-ui/src/views/board/warehouse/firstFloor.vue b/hw-ui/src/views/board/warehouse/firstFloor.vue
index 8dfd705a..d4823ced 100644
--- a/hw-ui/src/views/board/warehouse/firstFloor.vue
+++ b/hw-ui/src/views/board/warehouse/firstFloor.vue
@@ -121,11 +121,8 @@ import Chart from '@/components/board/Chart'
 import HighChart from '@/components/board/HighChart'
 import * as echarts from 'echarts'
 import {
-  bomInfo,
-  inAndOutInfo,
-  productInAndOutInfo,
-  purchaseInfo,
-  stockPercentage
+  energyFirstFloorData, getEnergyHistoryData
+
 } from '@/api/board/firstFloorWarehouse'
 import { parseTime } from '@/utils/ruoyi'
 
@@ -233,6 +230,12 @@ export default {
   },
   methods: {
     getData() {
+      energyFirstFloorData().then(e=>{
+        console.log(e)
+      })
+      getEnergyHistoryData().then(e=>{
+        console.log(e)
+      })
       let data = [
         {
           'is_ammeter': '否',