diff --git a/hw-ui/src/views/board/production/secondFloor.vue b/hw-ui/src/views/board/production/secondFloor.vue index ce546fd4..a53d484f 100644 --- a/hw-ui/src/views/board/production/secondFloor.vue +++ b/hw-ui/src/views/board/production/secondFloor.vue @@ -106,6 +106,56 @@
{{ topData.diff[2] }}
{{ topData.diff[3] }}
+ +
当前楼层:{{ tsjData.currentFloor }}F
+
状态: + {{ tsjData.elevatorStatus }} +
+
目标楼层: + {{ tsjData.targetFloor }}F +
+
+
+
+ 起始楼层 +
+
+ 目标楼层 +
+
+ 任务状态 +
+
+ +
+
+
+ {{ item.currPointId }}F +
+
+ {{ item.endPointId }}F +
+
+ {{ item.taskStatusStr }} +
+
+
+
+
@@ -121,6 +171,7 @@ import { workOrderProgress } from '@/api/board/secondFloorProduction' import { parseTime } from '@/utils/ruoyi' +import { elevatorStatus } from '@/api/board/firstFloorProduction' const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { @@ -131,6 +182,7 @@ export default { }, data() { return { + tsjData: {}, LineStatus: true, topData: { planAmount: [0, 0, 0, 0], @@ -196,7 +248,8 @@ export default { singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3 waitTime: 0 }, - scrollTableData: [] + scrollTableData: [], + scrollTableData1: [] } }, mounted() { @@ -211,6 +264,10 @@ export default { }, methods: { getData() { + elevatorStatus().then(e=>{ + this.tsjData = e.data + this.scrollTableData1 = e.data?.wcsTaskList + }) workOrderProgress().then(e => { console.log(e) this.scrollTableData = e.data.map((v, k) => { @@ -800,9 +857,9 @@ export default { .chart4 { position: absolute; - top: 66%; - left: 73%; - width: 23.8%; + top: 29%; + left: 29%; + width: 41.8%; height: 29%; } @@ -817,4 +874,20 @@ export default { border-radius: 50%; background-color: #ffff00; } +.status { + position: absolute; + transform: translate(-50%, -50%); + font-size: 1.1vw; + white-space: nowrap; + color: #eee; +} +.table2 { + position: absolute; + top: 71%; + left: 73%; + width: 23.5%; + height: 18.5%; + color: #fff; + font-size: 0.8vw +}