From a09afdd1cd3630b079056d04c40b6134d1f47638 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:39:41 +0800
Subject: [PATCH] 拉代码
---
src/views/dashboard/index.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5597a04..7ece016 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -18,9 +18,16 @@
<el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">Role</el-tab-pane>
</el-tabs>
</template>
- <template #middleBlock3> 浠诲姟璇︽儏 </template>
- <template #middleBlock4
- >浜哄憳淇℃伅
+ <template #middleBlock3>
+ <SubTitle>浠诲姟璇︽儏</SubTitle>
+ <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>
<PersonInfo :person="person"></PersonInfo>
</template>
<template #rightBlock1>
@@ -28,22 +35,32 @@
<CurrentDateTime></CurrentDateTime>
</div>
</template>
- <template #rightBlock2>鐘舵�侀潰鏉�</template>
- <template #rightBlock3>鐭ヨ瘑搴�</template>
+ <template #rightBlock2>
+ <DeviceStatusInfo :device="device" :type="1"></DeviceStatusInfo>
+ <DeviceStatusInfo :device="device" :type="2"></DeviceStatusInfo>
+ </template>
+ <template #rightBlock3>
+ <SubTitle>鐭ヨ瘑搴�</SubTitle>
+ </template>
</DashboardLayout>
</template>
<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'
import { useTasksStore } from '@/stores/tasks'
import { storeToRefs } from 'pinia'
import ProcessingInfo from '@/views/dashboard/components/ProcessingInfo.vue'
+import TaskControl from '@/views/dashboard/components/TaskControl.vue'
+import SubTitle from '@/views/dashboard/components/SubTitle.vue'
defineOptions({
name: 'DashboardView'
@@ -56,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