diff --git a/src/views/data/dataCataloguing.vue b/src/views/data/dataCataloguing.vue index db3d9a0..602a4ef 100644 --- a/src/views/data/dataCataloguing.vue +++ b/src/views/data/dataCataloguing.vue @@ -125,12 +125,12 @@ import get from 'lodash.get' columns: [ { title: '表名', - align:"center", + align:"left", dataIndex: 'tableName', }, { title: '报文名', - align:"center", + align:"left", dataIndex: 'tableMessName' }, ], @@ -147,12 +147,12 @@ import get from 'lodash.get' }, { title: '表名', - align:"center", + align:"left", dataIndex: 'tableName', }, { title: '报文名', - align:"center", + align:"left", dataIndex: 'tableMessName' }, ], @@ -163,6 +163,8 @@ import get from 'lodash.get' }, selectedRowKeys: [], tagselectedRowKeys: [], + selectedRowData: [], + tagselectedRowData: [], } }, mounted() { @@ -207,10 +209,11 @@ import get from 'lodash.get' methods: { handleSelectChange(selectedRowKeys,row) { this.selectedRowKeys = selectedRowKeys - console.log(row); + this.selectedRowData = row }, - taghandleSelectChange(selectedRowKeys) { + taghandleSelectChange(selectedRowKeys,row) { this.tagselectedRowKeys = selectedRowKeys + this.tagselectedRowData = row }, getdatatagSources(){ idcTableTaglist(this.tagqueryParam).then((res) => { @@ -232,10 +235,34 @@ import get from 'lodash.get' }); }, addtag(){ - + var that = this; + this.selectedRowData.forEach(item => { + idcTableTagRef({ + "tagId": that.queryParam.tagId, + "tableName": item.tableName, + "schemaName": item.schemaName + }).then((res) => { + if (res.success) { + that.getalltable(); + that.gettagTables(); + } else { + that.$message.warning(res.message); + } + }); + }) }, detag(){ - + var that = this; + this.tagselectedRowKeys.forEach(item => { + idcTableTagRefdelete({id: item}).then((res) => { + if (res.success) { + that.getalltable(); + that.gettagTables(); + } else { + that.$message.warning(res.message); + } + }); + }); }, getalltable(){ this.queryParam.tagId = this.queryRefsParam.tagId diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue index 33ad9b4..9bf961c 100644 --- a/src/views/data/dataCleansing.vue +++ b/src/views/data/dataCleansing.vue @@ -3,7 +3,7 @@
- + {{ d.cnName }} @@ -15,6 +15,8 @@ ref="table" size="middle" bordered + :pagination="false" + :scroll="{ y: 800 }" rowKey="id" :columns="columns" :dataSource="dataSource"> @@ -65,8 +67,7 @@ percent:0, websock:{}, queryParam: { - pageNum :1, - pageSize:20 + datatype:"" }, dataTypedataSources: [], dataSource:[ @@ -154,8 +155,8 @@ }, mounted() { //初始化websocket - this.initWebSocket() - this.getselect() + this.initWebSocket() + this.getselect() }, computed: { }, @@ -212,6 +213,7 @@ dataTypePageList(this.queryParam).then((res) => { if (res.success) { this.dataTypedataSources = res.result.rows||res.result; + this.queryParam.datatype = res.result.rows[0].cnName } else { this.$message.warning(res.message); } diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue index 84ebc0c..a2400a4 100644 --- a/src/views/data/dataManage.vue +++ b/src/views/data/dataManage.vue @@ -3,7 +3,7 @@
- + {{ d.cnName }} @@ -15,6 +15,8 @@ ref="table" size="middle" bordered + :pagination="false" + :scroll="{ y: 800 }" rowKey="id" :columns="columns" :dataSource="dataSource"> @@ -71,8 +73,7 @@ percent:0, websock:{}, queryParam: { - pageNum :1, - pageSize:20 + datatype:"" }, dataTypedataSources: [], dataSource:[ @@ -215,6 +216,7 @@ dataTypePageList(this.queryParam).then((res) => { if (res.success) { this.dataTypedataSources = res.result.rows||res.result; + this.queryParam.datatype = res.result.rows[0].cnName } else { this.$message.warning(res.message); }