From 1dabf22fd60419fa88a26d2e66b4965405e9ec78 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Fri, 30 Aug 2019 16:35:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/editTable/index.vue | 173 +++++++++++++++++++++++ src/views/display/demon/scheduling.vue | 99 ++++++------- 2 files changed, 216 insertions(+), 56 deletions(-) create mode 100644 src/views/components/editTable/index.vue diff --git a/src/views/components/editTable/index.vue b/src/views/components/editTable/index.vue new file mode 100644 index 000000000..42b591914 --- /dev/null +++ b/src/views/components/editTable/index.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/views/display/demon/scheduling.vue b/src/views/display/demon/scheduling.vue index 52281ebaf..0a9a7f108 100644 --- a/src/views/display/demon/scheduling.vue +++ b/src/views/display/demon/scheduling.vue @@ -97,65 +97,13 @@ export default { }, { title: '车组号', - prop: 'groupNumber', + prop: 'trainCode', type: 'select', width: '150', options: () => { return this.groupNumberList; }, editable: true, editing: true }, - { - title: '回库段', - prop: 'inDepot', - type: 'text' - }, - { - title: '回库状态', - prop: 'inStatus', - type: 'tag', - columnValue: (row) => { return this.$ConstSelect.translate(row.inStatus, 'Whether'); }, - tagType: (row) => { - switch (row.inStatus) { - case true: return 'success'; - case false: return 'danger'; - } - } - }, - { - title: '下线方向码', - prop: 'offlineDirectionCode', - type: 'text' - }, - { - title: '下线轨', - prop: 'offlineSection', - type: 'text' - }, - { - title: '下线服务号', - prop: 'offlineServerNumber', - type: 'text' - }, - { - title: '下线目的地', - prop: 'offlineTargetNumber', - type: 'text' - }, - { - title: '下线时间', - prop: 'offlineTime', - type: 'text' - }, - { - title: '下线车次号', - prop: 'offlineTripNumber', - type: 'text' - }, - { - title: '上线方向码', - prop: 'onlineDirectionCode', - type: 'text' - }, { title: '上线轨', prop: 'onlineSection', @@ -179,7 +127,8 @@ export default { { title: '上线车次号', prop: 'onlineTripNumber', - type: 'text' + type: 'text', + format: (row) => { return `${row.onlineDirectionCode}${row.onlineTripNumber}`; } }, { title: '出库段', @@ -199,9 +148,47 @@ export default { } }, { - title: '列车编码', - prop: 'trainCode', + title: '下线轨', + prop: 'offlineSection', type: 'text' + }, + { + title: '下线服务号', + prop: 'offlineServerNumber', + type: 'text' + }, + { + title: '下线目的地', + prop: 'offlineTargetNumber', + type: 'text' + }, + { + title: '下线时间', + prop: 'offlineTime', + type: 'text' + }, + { + title: '下线车次号', + prop: 'offlineTripNumber', + type: 'text', + format: (row) => { return `${row.offlineDirectionCode}${row.offlineTripNumber}`; } + }, + { + title: '回库段', + prop: 'inDepot', + type: 'text' + }, + { + title: '回库状态', + prop: 'inStatus', + type: 'tag', + columnValue: (row) => { return this.$ConstSelect.translate(row.inStatus, 'Whether'); }, + tagType: (row) => { + switch (row.inStatus) { + case true: return 'success'; + case false: return 'danger'; + } + } } ] },