From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/ABC/StreamOperationList.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/ABC/StreamOperationList.vue b/src/views/eam/ABC/StreamOperationList.vue
index 7538b72..846a617 100644
--- a/src/views/eam/ABC/StreamOperationList.vue
+++ b/src/views/eam/ABC/StreamOperationList.vue
@@ -36,7 +36,6 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
@@ -115,21 +114,28 @@
{
title:'鎿嶄綔',
align:"center",
- dataIndex: 'operation',
- width:400
+ dataIndex: 'operation_dictText',
+ width:300
},
{
title:'鎿嶄綔鑺傜偣',
align:"center",
- dataIndex: 'streamId',
- width:400
+ dataIndex: 'operationNode_dictText',
+ width:300
},
{
title:'鎿嶄綔浜�',
align:"center",
dataIndex: 'userId_dictText',
- width:400
+ width:300
+ },
+
+ {
+ title:'鎿嶄綔鏃堕棿',
+ align:"center",
+ dataIndex: 'createTime',
+ width:300
},
{
title:'鎿嶄綔浜烘剰瑙�',
--
Gitblit v1.9.3