diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue index 25b9265..e0efcd5 100644 --- a/src/views/datalink/Marines.vue +++ b/src/views/datalink/Marines.vue @@ -109,11 +109,6 @@ align:"fileName", dataIndex: 'fileName', }, - { - title: '创建时间', - align:"createTime", - dataIndex: 'createTime' - }, { title: '模式名称', align:"schemaName", @@ -124,10 +119,16 @@ align:"tableName", dataIndex: 'tableName', }, + { + title: '创建时间', + align:"createTime", + dataIndex: 'createTime' + }, { title: '状态', - align:"parseStatus", + align:"center", dataIndex: 'parseStatus', + scopedSlots: { customRender: 'parseStatus' }, }, { title: '解析进度', @@ -197,12 +198,18 @@ }, processFile: function (record) { var that = this; - postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => { - if (res.success) { - this.$message.success(res.message); - that.loadData(); + isDataLinkFileParsed({fileId:record.fileId}).then((res) => { + if (res) { + postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => { + if (res.success) { + this.$message.success(res.message); + that.loadData(); + } else { + this.$message.warning(res.message); + } + }); } else { - this.$message.warning(res.message); + this.$message.warning("解析中请勿重复点击"); } }); }, diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue index e37fd32..0dd8261 100644 --- a/src/views/datalink/carrierBased.vue +++ b/src/views/datalink/carrierBased.vue @@ -70,7 +70,7 @@