diff --git a/src/views/data/dataCataloguing.vue b/src/views/data/dataCataloguing.vue index fcf603b..883a68b 100644 --- a/src/views/data/dataCataloguing.vue +++ b/src/views/data/dataCataloguing.vue @@ -36,7 +36,7 @@ bordered rowKey="id" :pagination="false" - :scroll="{ y: tableScrollY }" + :scroll="{ x:false,y: tableScrollY }" :columns="tagcolumns" :dataSource="dataRefsSources"> @@ -67,7 +67,7 @@ -
+
@@ -127,6 +127,7 @@ { title: '表名', align:"left", + width: 220, dataIndex: 'tableName', }, { @@ -140,7 +141,7 @@ title: '#', dataIndex: '', key:'id', - width:60, + width: 60, align:"center", customRender:function (t,r,index) { return parseInt(index)+1; @@ -149,6 +150,7 @@ { title: '表名', align:"left", + width: 220, dataIndex: 'tableName', }, { @@ -166,13 +168,20 @@ tagselectedRowKeys: [], selectedRowData: [], tagselectedRowData: [], - tableScrollY:0, + tableScrollY: 0, } }, mounted() { - this.getdatatagSources() + this.getdatatagSources() + this.calculateScrollY(); }, computed: { + calculateScrollY() { + // 获取父容器高度（需减去表格内其他元素的高度，如分页栏） + const container = this.$refs.tableContainer; + const paginationHeight = 64; // 根据实际分页栏高度调整 + this.tableScrollY = container.clientHeight - paginationHeight; + }, getRowKey(record) { return `${record.schemaName}_${record.tableName}` }, @@ -209,12 +218,6 @@ }, methods: { - updateScrollY() { - const container = this.$refs.tableWrapper; - const paginationHeight = 64; // 分页栏高度 - const tableHeaderHeight = 55; // 表头高度 - this.tableScrollY = container.clientHeight - paginationHeight - tableHeaderHeight; - }, handleSelectChange(selectedRowKeys,row) { this.selectedRowKeys = selectedRowKeys this.selectedRowData = row @@ -261,6 +264,8 @@ } }); }) + this.selectedRowData = []; + this.selectedRowKeys = []; }, detag(){ var that = this; @@ -273,6 +278,8 @@ } }); }); + this.tagselectedRowKeys = []; + this.tagselectedRowData = []; }, getalltable(){ this.queryParam.tagId = this.queryRefsParam.tagId @@ -301,5 +308,7 @@ } \ No newline at end of file diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue index 8e6ea47..1ea60e7 100644 --- a/src/views/data/dataCleansing.vue +++ b/src/views/data/dataCleansing.vue @@ -4,18 +4,20 @@
- - + + {{ d.cnName }}
-
+
@@ -94,54 +96,16 @@ contentList:[], percent:0, websock:{}, + datatypequeryParam: { + schemaName:"", + sourceType:1 + }, queryParam: { pageNum :1, - pageSize:20 + pageSize:9999999, }, dataTypedataSources: [], dataSource:[ - { - tableName:"LA_DATA_TABLE_0001", - data1:"舰艇综合导航信息II", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"侦察预警、指挥控制", - }, - { - tableName:"LA_DATA_TABLE_0002", - data1:"动力报文", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"指挥控制", - }, - { - tableName:"LA_DATA_TABLE_0003", - data1:"电测试报文", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"支援保障", - }, - { - tableName:"LA_DATA_TABLE_0004", - data1:"损管测试报文", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"支援保障", - }, - { - tableName:"LA_DATA_TABLE_0005", - data1:"舰炮测试报文", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"装备运行状态", - }, - { - tableName:"LA_DATA_TABLE_0006", - data1:"反潜测试报文", - data2:"2024-03-06 10:30:26", - data3:"2024-03-06 15:30:26", - data4:"装备运行状态", - }, ], columns: [ { @@ -162,32 +126,35 @@ { title: '报文名', align:"center", - dataIndex: 'data1' + dataIndex: 'tableMessName' }, { title: '开始时间', align:"center", - dataIndex: 'data2' + dataIndex: 'startTime' }, { title: '最后更新时间', align:"center", - dataIndex: 'data3' + dataIndex: 'endTime' }, { title: '标签类型', align:"center", - dataIndex: 'data4' + dataIndex: 'tagNames' }, ], + tableScrollY: 0, } }, mounted() { //初始化websocket - this.initWebSocket() - this.getselect() + this.initWebSocket() + this.getselect() + this.calculateScrollY(); }, computed: { + }, destroyed: function () { // 离开页面生命周期函数 var userId = store.getters.userInfo.id; @@ -198,6 +165,12 @@ }, methods: { + calculateScrollY() { + // 获取父容器高度（需减去表格内其他元素的高度，如分页栏） + const container = this.$refs.tableContainer; + const paginationHeight = 64; // 根据实际分页栏高度调整 + this.tableScrollY = container.clientHeight - paginationHeight; + }, initWebSocket: function () { // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https var userId = store.getters.userInfo.id; @@ -216,23 +189,18 @@ }, websocketonmessage: function (e) { var data = eval("(" + e.data + ")"); - console.log(data); - //处理订阅信息 if(data.content.length >0){ - var char = "当前同步百分比："; - let index = data.content.indexOf(char); - if (index >= 0) { - let result = data.content.substring(index + char.length,data.content.length - 1); // 获取 "V" 及其后所有字符 - this.percent = parseInt(result) ; - } this.contentList.unshift(data.content); } + if(data.currProgress != null){ + this.percent = data.currProgress; + } }, websocketclose: function (e) { console.log("connection closed (" + e + ")"); }, dataAdd(){ - getAction("/rawToStandard/syncMultipleSchemas?dataTaskId=123").then((res) => { + getAction("/dataCleaning/cleaning?taskId=3806ce79-dc28-48a3-9250-c7729e6b3ad4").then((res) => { if (res.success) { this.$message.success(res.message); } @@ -242,26 +210,29 @@ dataTypePageList(this.queryParam).then((res) => { if (res.success) { this.dataTypedataSources = res.result.rows||res.result; + this.datatypequeryParam.schemaName = res.result.rows[0].cnName + this.getTables(); } else { this.$message.warning(res.message); } }); }, getTables(){ - // datasyncgetTableInfo().then((res) => { - // if (res.result) { - // this.confirmLoading = false; - // this.dataSource = res.result; - // this.models = 2; - // } else { - // this.$message.warning(res.message); - // } - // }); + getAction("/dataManager/getDataManagerInfo",this.datatypequeryParam).then((res) => { + if (res.result) { + this.dataSource = res.result; + } else { + this.$message.warning(res.message); + } + }); }, } } - \ No newline at end of file diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue index 84ebc0c..3ef4054 100644 --- a/src/views/data/dataManage.vue +++ b/src/views/data/dataManage.vue @@ -1,20 +1,23 @@ \ No newline at end of file diff --git a/src/views/data/thematicLibrary.vue b/src/views/data/thematicLibrary.vue index b655878..ff1bd79 100644 --- a/src/views/data/thematicLibrary.vue +++ b/src/views/data/thematicLibrary.vue @@ -1,145 +1,143 @@ + + +
+ + - - \ No newline at end of file + } + + \ No newline at end of file