From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sys/task/taskCenter.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/web/src/views/modules/sys/task/taskCenter.vue b/web/src/views/modules/sys/task/taskCenter.vue
index d13ae74..4d3bcf4 100644
--- a/web/src/views/modules/sys/task/taskCenter.vue
+++ b/web/src/views/modules/sys/task/taskCenter.vue
@@ -12,12 +12,16 @@
<alreadyTask :system="system" ref="alreadyTask" @alreadyTask="getDiagram1"></alreadyTask>
</el-tab-pane>
</el-tabs>
+ <el-dialog v-dialogDrag title="椤圭洰杩涘害鍥�" top="10vh" width='85%' :visible.sync="dialogVisible">
+ <processTimeline ref="processTimeline"></processTimeline>
+ </el-dialog>
</div>
</template>
<script>
import stayTask from './stay-task'
import alreadyTask from './already-task'
+ import processTimeline from '../../flowChart/processTimeline'
export default {
data() {
@@ -31,7 +35,8 @@
},
components: {
stayTask,
- alreadyTask
+ alreadyTask,
+ processTimeline
},
mounted() {
},
--
Gitblit v1.9.1