From db8db08adfc64cafb22ba01a4c707e1bcf12d2e9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 01 十二月 2023 19:43:36 +0800
Subject: [PATCH] Merge branch 'zwf' of http://192.168.5.5:10010/r/web/SchedulingDashboard into zwf
---
src/views/cockpitPage/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/cockpitPage/index.vue b/src/views/cockpitPage/index.vue
index 476bc4b..ca65da2 100644
--- a/src/views/cockpitPage/index.vue
+++ b/src/views/cockpitPage/index.vue
@@ -9,9 +9,13 @@
<template #leftBlock3>
<CountView></CountView>
</template>
-
+ <template #leftBlock4>
+ <OrderCompleteRadio></OrderCompleteRadio>
+ </template>
<template #leftBlock6>
- <PerSonnelProductivity @should-reload="reloadAllData"></PerSonnelProductivity>
+ <PerSonnelProductivity
+ @should-reload="reloadAllData"
+ ></PerSonnelProductivity>
</template>
<template #rightBlock1>
<DeviceChart @should-reload="reloadAllData"></DeviceChart>
@@ -34,6 +38,7 @@
import DeviceChart from "@/views/cockpitPage/components/DeviceChart.vue";
import MaterialChart from "@/views/cockpitPage/components/MaterialChart.vue";
import BarChart from "@/views/cockpitPage/components/BarChart.vue";
+import OrderCompleteRadio from "@/views/cockpitPage/components/OrderCompleteRadio";
export default {
components: {
StatisticalBox,
@@ -44,6 +49,7 @@
BarChart,
MachineStartupRate,
CountView,
+ OrderCompleteRadio,
},
props: {},
data() {
--
Gitblit v1.8.0