From 1519870c0e18171ced014a840e86a459dc6b00f1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 十二月 2023 17:26:06 +0800
Subject: [PATCH] 报工记录列表增加人员姓名
---
src/views/dashboard/components/ColorInfo.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/dashboard/components/ColorInfo.vue b/src/views/dashboard/components/ColorInfo.vue
index 6816e55..0de0157 100644
--- a/src/views/dashboard/components/ColorInfo.vue
+++ b/src/views/dashboard/components/ColorInfo.vue
@@ -1,26 +1,33 @@
<template>
<div class="color-info">
<div v-if="type == 1" class="color-one">
- 鍔犲伐鏁�({{ order.unit }})
- <span>{{ order.finishNumber || 0 }}</span>
+ 鍔犲伐鏁�({{ activeTask?.Order?.unit ?? '--' }})
+ <span>{{ plcInfo?.finishNumber ?? 0 }}</span>
</div>
<div v-else class="color-two">
- 鐩爣({{ order.unit }})
- <span> {{ order.amount || 0 }}</span>
+ 鐩爣({{ activeTask?.Order?.unit ?? '--' }})
+ <span> {{ plcInfo?.totalNumber ?? 0 }}</span>
</div>
</div>
</template>
<script setup lang="ts">
import { toRefs } from 'vue'
-import type { Order } from '@/api/task'
+import { usePLCStore } from '@/stores/plc'
+import { storeToRefs } from 'pinia'
+import { useTasksStore } from '@/stores/tasks'
export interface ColorInfoProps {
- order: Order
- type?: Number
+ /** 1鍔犲伐鏁� 2鐩爣鏁�*/
+ type?: 1 | 2
}
const props = defineProps<ColorInfoProps>()
-const { order, type } = toRefs(props)
+const { type } = toRefs(props)
+
+const plcStore = usePLCStore()
+const { plcInfo } = storeToRefs(plcStore)
+const taskStore = useTasksStore()
+const { activeTask } = storeToRefs(taskStore)
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0