From 5a3210eae5d1ad752d8c0bfa062a217982901e6c Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 11 十二月 2023 11:42:56 +0800
Subject: [PATCH] 流程轨迹
---
web/src/views/modules/flowChart/flowChartView.vue | 2 +-
web/src/views/modules/flowChart/ProcessTrajectory.vue | 11 +++++++++--
web/src/views/modules/flowChart/processTimeline.vue | 4 ++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/flowChart/ProcessTrajectory.vue b/web/src/views/modules/flowChart/ProcessTrajectory.vue
index 031bc8c..b73333d 100644
--- a/web/src/views/modules/flowChart/ProcessTrajectory.vue
+++ b/web/src/views/modules/flowChart/ProcessTrajectory.vue
@@ -1,13 +1,20 @@
<!--娴佺▼杞ㄨ抗-->
<template>
- <el-table :data="tableData" v-adaptive="{bottomOffset: 100}"
- height="250"
+ <div>
+ <el-form :inline="true" style="padding: 0">
+ <zt-form-item style="float: left;margin-bottom: 0">
+ <zt-button style="background:#EAEBEE;border: 1px solid #EAEBEE;color:#000">娴佺▼杞ㄨ抗</zt-button>
+ </zt-form-item>
+ </el-form>
+ <el-table :data="tableData"
+ height="550"
v-loading="this.dataLoading">
<el-table-column align="center" label="姝ラ鍚�" prop="stepName"></el-table-column>
<el-table-column align="center" label="瑙掕壊鍚�" prop="receiveName"></el-table-column>
<el-table-column align="center" label="鎺ュ彈浠诲姟鏃堕棿" prop="receiveTime"></el-table-column>
<el-table-column align="center" label="瀹屾垚鏃堕棿" prop="finishTime"></el-table-column>
</el-table>
+ </div>
</template>
<script>
diff --git a/web/src/views/modules/flowChart/flowChartView.vue b/web/src/views/modules/flowChart/flowChartView.vue
index a0fcc6f..ef2013a 100644
--- a/web/src/views/modules/flowChart/flowChartView.vue
+++ b/web/src/views/modules/flowChart/flowChartView.vue
@@ -223,7 +223,7 @@
this.graph = new Graph({
container: document.getElementById('flowChartView'),
width: document.documentElement.clientWidth*0.5,
- height:400,
+ height:550,
// async: true,
// grid: {
// visible: true,
diff --git a/web/src/views/modules/flowChart/processTimeline.vue b/web/src/views/modules/flowChart/processTimeline.vue
index 4e073cf..01a682e 100644
--- a/web/src/views/modules/flowChart/processTimeline.vue
+++ b/web/src/views/modules/flowChart/processTimeline.vue
@@ -1,9 +1,9 @@
<template>
<el-row :gutter="10">
- <el-col>
+ <el-col :span="12">
<FlowChartView :flowChartHeight="flowChartHeight" ref="flowChartView"></FlowChartView>
</el-col>
- <el-col style="margin-top: 10px">
+ <el-col :span="12">
<ProcessTrajectory ref="processTrajectory" @refreshDataList="getQuery()"></ProcessTrajectory>
</el-col>
</el-row>
--
Gitblit v1.9.1