|
1
|
<template>
|
1
|
<template>
|
|
2
|
<el-container>
|
2
|
<el-container>
|
|
3
|
<el-main>
|
3
|
<el-main>
|
|
|
|
4
|
+ <el-row>
|
|
|
|
5
|
+ <el-tabs type="border-card" @tab-click="handleClick">
|
|
|
|
6
|
+ <el-tab-pane label="执行中">
|
|
4
|
<!--检索条件-->
|
7
|
<!--检索条件-->
|
|
5
|
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
|
8
|
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
|
|
6
|
<el-col :span="6">
|
9
|
<el-col :span="6">
|
|
@@ -28,13 +31,23 @@ |
|
@@ -28,13 +31,23 @@ |
|
28
|
<template slot-scope="props">
|
31
|
<template slot-scope="props">
|
|
29
|
<el-form label-position="right" label-width="120px" style="text-align: left">
|
32
|
<el-form label-position="right" label-width="120px" style="text-align: left">
|
|
30
|
<el-row>
|
33
|
<el-row>
|
|
|
|
34
|
+ <el-form-item label="id：">
|
|
|
|
35
|
+ <span>{{ props.row.id}}</span>
|
|
|
|
36
|
+ </el-form-item>
|
|
|
|
37
|
+ </el-row>
|
|
|
|
38
|
+ <el-row>
|
|
|
|
39
|
+ <el-form-item label="执行人id：">
|
|
|
|
40
|
+ <span>{{ props.row.deploymentId}}</span>
|
|
|
|
41
|
+ </el-form-item>
|
|
|
|
42
|
+ </el-row>
|
|
|
|
43
|
+ <el-row>
|
|
31
|
<el-form-item label="变量数量：">
|
44
|
<el-form-item label="变量数量：">
|
|
32
|
- <span>{{ props.row.variableCount }}</span>
|
45
|
+ <span>{{ props.row.variableCount}}</span>
|
|
33
|
</el-form-item>
|
46
|
</el-form-item>
|
|
34
|
</el-row>
|
47
|
</el-row>
|
|
35
|
<el-row>
|
48
|
<el-row>
|
|
36
|
<el-form-item label="瞬时变量：">
|
49
|
<el-form-item label="瞬时变量：">
|
|
37
|
- <span>{{ JSON.stringify(props.row.transientVariables) }}</span>
|
50
|
+ <span>{{ JSON.stringify(props.row.transientVariables)}}</span>
|
|
38
|
</el-form-item>
|
51
|
</el-form-item>
|
|
39
|
</el-row>
|
52
|
</el-row>
|
|
40
|
<el-row>
|
53
|
<el-row>
|
|
@@ -44,12 +57,12 @@ |
|
@@ -44,12 +57,12 @@ |
|
44
|
</el-row>
|
57
|
</el-row>
|
|
45
|
<el-row>
|
58
|
<el-row>
|
|
46
|
<el-form-item label="流程实例ID：">
|
59
|
<el-form-item label="流程实例ID：">
|
|
47
|
- <span>{{ props.row.processInstanceId }}</span>
|
60
|
+ <span>{{ props.row.processInstanceId}}</span>
|
|
48
|
</el-form-item>
|
61
|
</el-form-item>
|
|
49
|
</el-row>
|
62
|
</el-row>
|
|
50
|
<el-row>
|
63
|
<el-row>
|
|
51
|
<el-form-item label="流程定义版本：">
|
64
|
<el-form-item label="流程定义版本：">
|
|
52
|
- <span>{{ props.row.processDefinitionVersion }}</span>
|
65
|
+ <span>{{ props.row.processDefinitionVersion}}</span>
|
|
53
|
</el-form-item>
|
66
|
</el-form-item>
|
|
54
|
</el-row>
|
67
|
</el-row>
|
|
55
|
</el-form>
|
68
|
</el-form>
|
|
@@ -75,6 +88,11 @@ |
|
@@ -75,6 +88,11 @@ |
|
75
|
width="160">
|
88
|
width="160">
|
|
76
|
</el-table-column>
|
89
|
</el-table-column>
|
|
77
|
<el-table-column
|
90
|
<el-table-column
|
|
|
|
91
|
+ label="结束时间"
|
|
|
|
92
|
+ prop="endTime"
|
|
|
|
93
|
+ width="160">
|
|
|
|
94
|
+ </el-table-column>
|
|
|
|
95
|
+ <el-table-column
|
|
78
|
label="执行中"
|
96
|
label="执行中"
|
|
79
|
prop="isActive">
|
97
|
prop="isActive">
|
|
80
|
</el-table-column>
|
98
|
</el-table-column>
|
|
@@ -83,8 +101,150 @@ |
|
@@ -83,8 +101,150 @@ |
|
83
|
prop="isEnded">
|
101
|
prop="isEnded">
|
|
84
|
</el-table-column>
|
102
|
</el-table-column>
|
|
85
|
<el-table-column
|
103
|
<el-table-column
|
|
86
|
- label="租户"
|
|
|
|
87
|
- prop="tenantId">
|
104
|
+ label="流程状态"
|
|
|
|
105
|
+ prop="suspensionState">
|
|
|
|
106
|
+ <template slot-scope="scope">
|
|
|
|
107
|
+ <span v-if="scope.row.suspensionState ===1">活跃</span>
|
|
|
|
108
|
+ <span v-else>中断</span>
|
|
|
|
109
|
+ </template>
|
|
|
|
110
|
+ </el-table-column>
|
|
|
|
111
|
+ <el-table-column
|
|
|
|
112
|
+ label="实例关键字"
|
|
|
|
113
|
+ prop="processDefinitionKey">
|
|
|
|
114
|
+ </el-table-column>
|
|
|
|
115
|
+ <el-table-column
|
|
|
|
116
|
+ label="用时"
|
|
|
|
117
|
+ prop="durationInMillis">
|
|
|
|
118
|
+ <template slot-scope="scope">
|
|
|
|
119
|
+ <span>
|
|
|
|
120
|
+ {{ scope.row.durationInMillis | formatSeconds }}
|
|
|
|
121
|
+ </span>
|
|
|
|
122
|
+ </template>
|
|
|
|
123
|
+ </el-table-column>
|
|
|
|
124
|
+ <el-table-column
|
|
|
|
125
|
+ label="流程定义名称"
|
|
|
|
126
|
+ prop="processDefinitionName"
|
|
|
|
127
|
+ width="140">
|
|
|
|
128
|
+ </el-table-column>
|
|
|
|
129
|
+ <el-table-column
|
|
|
|
130
|
+ label="isDeleted"
|
|
|
|
131
|
+ prop="isDeleted">
|
|
|
|
132
|
+ </el-table-column>
|
|
|
|
133
|
+ </el-table>
|
|
|
|
134
|
+ </el-row>
|
|
|
|
135
|
+ <!--分页模块-->
|
|
|
|
136
|
+ <el-row style="float: right;margin-top: 20px">
|
|
|
|
137
|
+ <el-col>
|
|
|
|
138
|
+ <div class="block">
|
|
|
|
139
|
+ <el-pagination
|
|
|
|
140
|
+ @size-change="handleSizeChange"
|
|
|
|
141
|
+ @current-change="handleCurrentChange"
|
|
|
|
142
|
+ :current-page="queryinfo.pageNum"
|
|
|
|
143
|
+ :page-sizes="[10, 20, 30, 40]"
|
|
|
|
144
|
+ :page-size="queryinfo.pageSize"
|
|
|
|
145
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
146
|
+ :total="total">
|
|
|
|
147
|
+ </el-pagination>
|
|
|
|
148
|
+ </div>
|
|
|
|
149
|
+ </el-col>
|
|
|
|
150
|
+ </el-row>
|
|
|
|
151
|
+ </el-tab-pane>
|
|
|
|
152
|
+ <el-tab-pane label="已完成">
|
|
|
|
153
|
+ <!--检索条件-->
|
|
|
|
154
|
+ <el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
|
|
|
|
155
|
+ <el-col :span="6">
|
|
|
|
156
|
+ <el-input v-model="queryinfo.processInstanceId " placeholder="实例ID" style="width: 200px" clearable>
|
|
|
|
157
|
+ <template slot="prepend">实例ID</template>
|
|
|
|
158
|
+ </el-input>
|
|
|
|
159
|
+ </el-col>
|
|
|
|
160
|
+ <el-col :span="7">
|
|
|
|
161
|
+ <el-input v-model="queryinfo.processDefinitionKey" placeholder="实例关键字" style="width: 220px" clearable>
|
|
|
|
162
|
+ <template slot="prepend">实例关键字</template>
|
|
|
|
163
|
+ </el-input>
|
|
|
|
164
|
+ </el-col>
|
|
|
|
165
|
+ <el-col :span="8">
|
|
|
|
166
|
+ <el-button type="primary" v-on:click="getHistroyList">查询</el-button>
|
|
|
|
167
|
+ </el-col>
|
|
|
|
168
|
+ </el-row>
|
|
|
|
169
|
+ <el-row>
|
|
|
|
170
|
+ <el-table
|
|
|
|
171
|
+ v-loading="tableloading"
|
|
|
|
172
|
+ :data="tableData"
|
|
|
|
173
|
+ style="width: 100%"
|
|
|
|
174
|
+ :default-sort = "{prop: 'date', order: 'descending'}"
|
|
|
|
175
|
+ :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
|
|
|
|
176
|
+ <el-table-column type="expand">
|
|
|
|
177
|
+ <template slot-scope="props">
|
|
|
|
178
|
+ <el-form label-position="right" label-width="120px" style="text-align: left">
|
|
|
|
179
|
+ <el-row>
|
|
|
|
180
|
+ <el-form-item label="id：">
|
|
|
|
181
|
+ <span>{{ props.row.id}}</span>
|
|
|
|
182
|
+ </el-form-item>
|
|
|
|
183
|
+ </el-row>
|
|
|
|
184
|
+ <el-row>
|
|
|
|
185
|
+ <el-form-item label="执行人id：">
|
|
|
|
186
|
+ <span>{{ props.row.deploymentId}}</span>
|
|
|
|
187
|
+ </el-form-item>
|
|
|
|
188
|
+ </el-row>
|
|
|
|
189
|
+ <el-row>
|
|
|
|
190
|
+ <el-form-item label="变量数量：">
|
|
|
|
191
|
+ <span>{{ props.row.variableCount}}</span>
|
|
|
|
192
|
+ </el-form-item>
|
|
|
|
193
|
+ </el-row>
|
|
|
|
194
|
+ <el-row>
|
|
|
|
195
|
+ <el-form-item label="瞬时变量：">
|
|
|
|
196
|
+ <span>{{ JSON.stringify(props.row.transientVariables)}}</span>
|
|
|
|
197
|
+ </el-form-item>
|
|
|
|
198
|
+ </el-row>
|
|
|
|
199
|
+ <el-row>
|
|
|
|
200
|
+ <el-form-item label="流程定义ID：">
|
|
|
|
201
|
+ <span>{{ props.row.processDefinitionId}}</span>
|
|
|
|
202
|
+ </el-form-item>
|
|
|
|
203
|
+ </el-row>
|
|
|
|
204
|
+ <el-row>
|
|
|
|
205
|
+ <el-form-item label="流程实例ID：">
|
|
|
|
206
|
+ <span>{{ props.row.processInstanceId}}</span>
|
|
|
|
207
|
+ </el-form-item>
|
|
|
|
208
|
+ </el-row>
|
|
|
|
209
|
+ <el-row>
|
|
|
|
210
|
+ <el-form-item label="流程定义版本：">
|
|
|
|
211
|
+ <span>{{ props.row.processDefinitionVersion}}</span>
|
|
|
|
212
|
+ </el-form-item>
|
|
|
|
213
|
+ </el-row>
|
|
|
|
214
|
+ </el-form>
|
|
|
|
215
|
+ </template>
|
|
|
|
216
|
+ </el-table-column>
|
|
|
|
217
|
+ <el-table-column
|
|
|
|
218
|
+ fixed="left"
|
|
|
|
219
|
+ label="操作">
|
|
|
|
220
|
+ <template slot-scope="scope">
|
|
|
|
221
|
+ <el-button type="success" size="mini" @click="chart(scope.$index,scope.row)">流程图</el-button>
|
|
|
|
222
|
+ <!-- <el-button type="warning" size="mini" @click="remove(scope.$index,scope.row)">删除</el-button>-->
|
|
|
|
223
|
+ <!-- <el-button type="danger" size="mini" @click="removeDel(scope.$index,scope.row)">彻底删除</el-button>-->
|
|
|
|
224
|
+ </template>
|
|
|
|
225
|
+ </el-table-column>
|
|
|
|
226
|
+ <el-table-column
|
|
|
|
227
|
+ label="实例名称"
|
|
|
|
228
|
+ prop="name"
|
|
|
|
229
|
+ width="160">
|
|
|
|
230
|
+ </el-table-column>
|
|
|
|
231
|
+ <el-table-column
|
|
|
|
232
|
+ label="开始时间"
|
|
|
|
233
|
+ prop="startTime"
|
|
|
|
234
|
+ width="160">
|
|
|
|
235
|
+ </el-table-column>
|
|
|
|
236
|
+ <el-table-column
|
|
|
|
237
|
+ label="结束时间"
|
|
|
|
238
|
+ prop="endTime"
|
|
|
|
239
|
+ width="160">
|
|
|
|
240
|
+ </el-table-column>
|
|
|
|
241
|
+ <el-table-column
|
|
|
|
242
|
+ label="执行中"
|
|
|
|
243
|
+ prop="isActive">
|
|
|
|
244
|
+ </el-table-column>
|
|
|
|
245
|
+ <el-table-column
|
|
|
|
246
|
+ label="是否结束"
|
|
|
|
247
|
+ prop="isEnded">
|
|
88
|
</el-table-column>
|
248
|
</el-table-column>
|
|
89
|
<el-table-column
|
249
|
<el-table-column
|
|
90
|
label="流程状态"
|
250
|
label="流程状态"
|
|
@@ -98,6 +258,24 @@ |
|
@@ -98,6 +258,24 @@ |
|
98
|
label="实例关键字"
|
258
|
label="实例关键字"
|
|
99
|
prop="processDefinitionKey">
|
259
|
prop="processDefinitionKey">
|
|
100
|
</el-table-column>
|
260
|
</el-table-column>
|
|
|
|
261
|
+ <el-table-column
|
|
|
|
262
|
+ prop="durationInMillis"
|
|
|
|
263
|
+ label="用时">
|
|
|
|
264
|
+ <template slot-scope="scope">
|
|
|
|
265
|
+ <span>
|
|
|
|
266
|
+ {{ scope.row.durationInMillis | formatSeconds }}
|
|
|
|
267
|
+ </span>
|
|
|
|
268
|
+ </template>
|
|
|
|
269
|
+ </el-table-column>
|
|
|
|
270
|
+ <el-table-column
|
|
|
|
271
|
+ label="流程定义名称"
|
|
|
|
272
|
+ prop="processDefinitionName"
|
|
|
|
273
|
+ width="140">
|
|
|
|
274
|
+ </el-table-column>
|
|
|
|
275
|
+ <el-table-column
|
|
|
|
276
|
+ label="isDeleted"
|
|
|
|
277
|
+ prop="isDeleted">
|
|
|
|
278
|
+ </el-table-column>
|
|
101
|
</el-table>
|
279
|
</el-table>
|
|
102
|
</el-row>
|
280
|
</el-row>
|
|
103
|
<!--分页模块-->
|
281
|
<!--分页模块-->
|
|
@@ -116,6 +294,10 @@ |
|
@@ -116,6 +294,10 @@ |
|
116
|
</div>
|
294
|
</div>
|
|
117
|
</el-col>
|
295
|
</el-col>
|
|
118
|
</el-row>
|
296
|
</el-row>
|
|
|
|
297
|
+ </el-tab-pane>
|
|
|
|
298
|
+
|
|
|
|
299
|
+ </el-tabs>
|
|
|
|
300
|
+ </el-row>
|
|
119
|
<!-- 流程图弹框-->
|
301
|
<!-- 流程图弹框-->
|
|
120
|
<el-row>
|
302
|
<el-row>
|
|
121
|
<el-dialog title="流程图" :visible.sync="dialogFormVisible">
|
303
|
<el-dialog title="流程图" :visible.sync="dialogFormVisible">
|
|
@@ -139,7 +321,7 @@ |
|
@@ -139,7 +321,7 @@ |
|
139
|
</template>
|
321
|
</template>
|
|
140
|
|
322
|
|
|
141
|
<script>
|
323
|
<script>
|
|
142
|
- import {instanceList,processDiagram} from "../../api/technological";
|
324
|
+ import {instanceList,processDiagram,histroyList} from "../../api/technological";
|
|
143
|
|
325
|
|
|
144
|
export default {
|
326
|
export default {
|
|
145
|
name: "example",
|
327
|
name: "example",
|
|
@@ -160,10 +342,55 @@ |
|
@@ -160,10 +342,55 @@ |
|
160
|
}
|
342
|
}
|
|
161
|
}
|
343
|
}
|
|
162
|
},
|
344
|
},
|
|
|
|
345
|
+ filters: {
|
|
|
|
346
|
+ formatSeconds(value) {
|
|
|
|
347
|
+ console.log(value)
|
|
|
|
348
|
+ let result = parseInt(value);
|
|
|
|
349
|
+
|
|
|
|
350
|
+ let y =
|
|
|
|
351
|
+ Math.floor(result / 86400000) < 10
|
|
|
|
352
|
+ ? "0" + Math.floor(result / 86400000)
|
|
|
|
353
|
+ : Math.floor(result / 86400000);
|
|
|
|
354
|
+
|
|
|
|
355
|
+ let h =
|
|
|
|
356
|
+ Math.floor((result / 3600000) % 24) < 10
|
|
|
|
357
|
+ ? "0" + Math.floor((result / 3600000) % 24)
|
|
|
|
358
|
+ : Math.floor((result / 3600000) % 24);
|
|
|
|
359
|
+
|
|
|
|
360
|
+ let m =
|
|
|
|
361
|
+ Math.floor((result / 60000) % 60) < 10
|
|
|
|
362
|
+ ? "0" + Math.floor((result / 60000) % 60)
|
|
|
|
363
|
+ : Math.floor((result / 60000) % 60);
|
|
|
|
364
|
+
|
|
|
|
365
|
+ let s =
|
|
|
|
366
|
+ Math.floor(result % 60) < 10
|
|
|
|
367
|
+ ? "0" + Math.floor(result % 60)
|
|
|
|
368
|
+ : Math.floor(result % 60);
|
|
|
|
369
|
+
|
|
|
|
370
|
+ let res = "";
|
|
|
|
371
|
+ if (y !== "00") res += `${y}天`;
|
|
|
|
372
|
+
|
|
|
|
373
|
+ if (h !== "00") res += `${h}时`;
|
|
|
|
374
|
+
|
|
|
|
375
|
+ if (m !== "00") res += `${m}分`;
|
|
|
|
376
|
+
|
|
|
|
377
|
+ res += `${s}秒`;
|
|
|
|
378
|
+
|
|
|
|
379
|
+ return res;
|
|
|
|
380
|
+ },
|
|
|
|
381
|
+ },
|
|
163
|
mounted() {
|
382
|
mounted() {
|
|
164
|
this.getList();
|
383
|
this.getList();
|
|
165
|
},
|
384
|
},
|
|
166
|
methods: {
|
385
|
methods: {
|
|
|
|
386
|
+
|
|
|
|
387
|
+ handleClick(tab){
|
|
|
|
388
|
+ if (tab.index == 0) {
|
|
|
|
389
|
+ this.getList();
|
|
|
|
390
|
+ } else {
|
|
|
|
391
|
+ this.getHistroyList();
|
|
|
|
392
|
+ }
|
|
|
|
393
|
+ },
|
|
167
|
// 分页
|
394
|
// 分页
|
|
168
|
handleSizeChange(val) {
|
395
|
handleSizeChange(val) {
|
|
169
|
this.queryinfo.pageSize= val
|
396
|
this.queryinfo.pageSize= val
|
|
@@ -197,6 +424,30 @@ |
|
@@ -197,6 +424,30 @@ |
|
197
|
|
424
|
|
|
198
|
})
|
425
|
})
|
|
199
|
},
|
426
|
},
|
|
|
|
427
|
+ getHistroyList() {
|
|
|
|
428
|
+ const _this = this
|
|
|
|
429
|
+ this.tableloading = true;
|
|
|
|
430
|
+ histroyList(this.queryinfo).then((response) => {
|
|
|
|
431
|
+ console.log(response);
|
|
|
|
432
|
+ const res = response.data
|
|
|
|
433
|
+ if (res.code != '200') {
|
|
|
|
434
|
+ return _this.$message.error('获取消息收发记录，失败！')
|
|
|
|
435
|
+ }
|
|
|
|
436
|
+ // 获取列表数据
|
|
|
|
437
|
+ _this.tableData = res.data;
|
|
|
|
438
|
+ // 获取列表的总记录数
|
|
|
|
439
|
+
|
|
|
|
440
|
+ _this.total = res.total
|
|
|
|
441
|
+ this.tableloading = false;
|
|
|
|
442
|
+ _this.$message.success('获取消息收发记录，成功！')
|
|
|
|
443
|
+ }).catch(error => {
|
|
|
|
444
|
+
|
|
|
|
445
|
+ // 关闭加载
|
|
|
|
446
|
+ _this.$message.error(error.toString())
|
|
|
|
447
|
+ this.tableloading = false;
|
|
|
|
448
|
+
|
|
|
|
449
|
+ })
|
|
|
|
450
|
+ },
|
|
200
|
// 打开流程图
|
451
|
// 打开流程图
|
|
201
|
chart(index, row) {
|
452
|
chart(index, row) {
|
|
202
|
this.dialogFormVisible = true
|
453
|
this.dialogFormVisible = true
|
|
@@ -208,7 +459,8 @@ |
|
@@ -208,7 +459,8 @@ |
|
208
|
});
|
459
|
});
|
|
209
|
|
460
|
|
|
210
|
},
|
461
|
},
|
|
211
|
- }
|
462
|
+ },
|
|
|
|
463
|
+
|
|
212
|
}
|
464
|
}
|
|
213
|
</script>
|
465
|
</script>
|
|
214
|
|
466
|
|
