From 778c10923ce7adf233f8a6b820d5824aa2402843 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 31 十月 2023 20:28:01 +0800
Subject: [PATCH] 加工数+目标数的组件+设备状态的组件
---
src/views/dashboard/index.vue | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e086940..7ece016 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -23,6 +23,8 @@
<div class="task-detail">
<TaskControl :task="activeTask"></TaskControl>
</div>
+ <ColorInfo :order="order" :type="1"></ColorInfo>
+ <ColorInfo :order="order" :type="2"></ColorInfo>
</template>
<template #middleBlock4>
<SubTitle>浜哄憳淇℃伅</SubTitle>
@@ -33,7 +35,10 @@
<CurrentDateTime></CurrentDateTime>
</div>
</template>
- <template #rightBlock2>鐘舵�侀潰鏉�</template>
+ <template #rightBlock2>
+ <DeviceStatusInfo :device="device" :type="1"></DeviceStatusInfo>
+ <DeviceStatusInfo :device="device" :type="2"></DeviceStatusInfo>
+ </template>
<template #rightBlock3>
<SubTitle>鐭ヨ瘑搴�</SubTitle>
</template>
@@ -42,9 +47,12 @@
<script setup lang="ts">
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
-import type { Worker } from '@/api/task'
+import type { Worker, Order } from '@/api/task'
+import type { PLCResponse } from '@/api/plc'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
+import ColorInfo from '@/views/dashboard/components/ColorInfo.vue'
+import DeviceStatusInfo from '@/views/dashboard/components/DeviceStatusInfo.vue'
import type { LabelValue } from '@/views/dashboard/components/TaskTabs.vue'
import TaskTabs from '@/views/dashboard/components/TaskTabs.vue'
import CurrentDateTime from '@/views/dashboard/components/CurrentDateTime.vue'
@@ -65,7 +73,21 @@
} as unknown as Worker
})
const process = computed(() => {
- return { name: '宸ヨ壓鍚嶇О', number: '111' }
+ return { product: '浜у搧鍚嶇О', number: '111', procedure: '宸ヨ壓鍚嶇О', isUpdate: true }
+})
+
+const order = computed(() => {
+ return {
+ finishNumber: 0,
+ unit: '涓�',
+ amount: '10'
+ } as unknown as Order
+})
+const device = computed(() => {
+ return {
+ plcStatus: 1,
+ plcNotConnected: false
+ } as unknown as PLCResponse
})
const taskTabsList = [
{
--
Gitblit v1.8.0