From 8c84c7277018b259f5b99f26cbfd14603bc4e4c0 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:39:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/views/dashboard/index.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 7ece016..fb32de0 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -6,7 +6,9 @@
<template #leftBlock2>
<ChannelCollapse :channels="channels"></ChannelCollapse>
</template>
- <template #middleBlock1>鏍囬</template>
+ <template #middleBlock1>
+ <DashboardTitle></DashboardTitle>
+ </template>
<template #middleBlock2>
<el-tabs v-model="activeMainTabName" class="main-info-tabs">
<el-tab-pane label="鍔犲伐淇℃伅" name="鍔犲伐淇℃伅">
@@ -21,7 +23,7 @@
<template #middleBlock3>
<SubTitle>浠诲姟璇︽儏</SubTitle>
<div class="task-detail">
- <TaskControl :task="activeTask"></TaskControl>
+ <TaskControl :task="activeTask" @should-reload="reloadAllData"></TaskControl>
</div>
<ColorInfo :order="order" :type="1"></ColorInfo>
<ColorInfo :order="order" :type="2"></ColorInfo>
@@ -47,7 +49,7 @@
<script setup lang="ts">
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
-import type { Worker, Order } from '@/api/task'
+import type { Worker, Order, Task } 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'
@@ -61,6 +63,7 @@
import ProcessingInfo from '@/views/dashboard/components/ProcessingInfo.vue'
import TaskControl from '@/views/dashboard/components/TaskControl.vue'
import SubTitle from '@/views/dashboard/components/SubTitle.vue'
+import DashboardTitle from '@/views/dashboard/components/DashboardTitle.vue'
defineOptions({
name: 'DashboardView'
@@ -73,7 +76,7 @@
} as unknown as Worker
})
const process = computed(() => {
- return { product: '浜у搧鍚嶇О', number: '111', procedure: '宸ヨ壓鍚嶇О', isUpdate: true }
+ return { product: '浜у搧鍚嶇О', number: '111', procedure: '宸ヨ壓鍚嶇О', isUpdate: true } as any
})
const order = computed(() => {
@@ -113,6 +116,10 @@
function changeTab(tab: LabelValue) {
tasksStore.getChannels(tab.value)
}
+
+function reloadAllData(task: Task) {
+ tasksStore.reload(task.Channel)
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0