From 031b4d9a2a6a757571015b1903bb125d414ecb2a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 02 十一月 2023 13:59:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index fbbaf4b..fd0f348 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
</template>
<template #middleBlock4>
<SubTitle>浜哄憳淇℃伅</SubTitle>
- <PersonInfo :person="person"></PersonInfo>
+ <PersonInfo v-for="worker in workers" :key="worker.workerId" :person="worker"></PersonInfo>
</template>
<template #rightBlock1>
<div class="date-time">
@@ -75,12 +75,12 @@
name: 'DashboardView'
})
-const person = computed(() => {
- return {
- workerName: '濮撳悕',
- phone: '111'
- } as unknown as Worker
+// 鑾峰彇褰撳墠楂樹寒浠诲姟鐨勫�肩彮浜轰俊鎭�
+const taskStore = useTasksStore()
+const workers = computed(() => {
+ return taskStore.activeTask?.Procedure?.procedure?.workers ?? []
})
+
const process = computed(() => {
return { product: '浜у搧鍚嶇О', number: '111', procedure: '宸ヨ壓鍚嶇О', isUpdate: true } as any
})
--
Gitblit v1.8.0