From c4f6ae6dd193ef78b5eedebedff16c7c5292ec0f Mon Sep 17 00:00:00 2001 From: RenCheng Date: Sat, 21 Jun 2025 18:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8F=82=E6=95=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.js | 2 +- .../datawashing/dataformatsRules/index.vue | 80 ++++++++++++++--- .../dataformatsRules/rulesModel.vue | 12 +-- .../datawashing/dataformatsRules/subPage.vue | 9 +- .../datatypeConversionRules/index.vue | 79 ++++++++++++++--- .../datatypeConversionRules/rulesModel.vue | 12 +-- .../datatypeConversionRules/subPage.vue | 9 +- .../datawashing/deEmphasisRules/index.vue | 79 ++++++++++++++--- .../deEmphasisRules/modules/rulesModel.vue | 2 +- .../datawashing/missingvalueRules/index.vue | 85 ++++++++++++++---- src/views/datawashing/tempfive/index.vue | 87 +++++++++++++++---- src/views/datawashing/tempfive/rulesModel.vue | 2 +- src/views/datawashing/tempfour/index.vue | 79 ++++++++++++++--- src/views/datawashing/tempfour/rulesModel.vue | 12 +-- src/views/datawashing/tempfour/subPage.vue | 9 +- src/views/datawashing/tempone/index.vue | 77 +++++++++++++--- src/views/datawashing/tempone/rulesModel.vue | 12 +-- src/views/datawashing/tempone/subPage.vue | 11 ++- src/views/datawashing/tempthree/index.vue | 79 ++++++++++++++--- .../datawashing/tempthree/rulesModel.vue | 12 +-- src/views/datawashing/tempthree/subPage.vue | 4 +- src/views/datawashing/temptwo/index.vue | 85 ++++++++++++++---- 22 files changed, 670 insertions(+), 168 deletions(-) diff --git a/public/config.js b/public/config.js index 9a36463..e5324dd 100644 --- a/public/config.js +++ b/public/config.js @@ -1,4 +1,4 @@ window.AppConfig = { systemTitle: '末端数据接入处理系统', - apiUrl: 'http://pbl1.natapp1.cc/jeecg-boot' + apiUrl: 'http://pbl.natapp1.cc/jeecg-boot' } \ No newline at end of file diff --git a/src/views/datawashing/dataformatsRules/index.vue b/src/views/datawashing/dataformatsRules/index.vue index e47f873..95a052c 100644 --- a/src/views/datawashing/dataformatsRules/index.vue +++ b/src/views/datawashing/dataformatsRules/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,7 +37,7 @@ - + @@ -75,10 +93,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -114,7 +134,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -131,16 +154,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -168,11 +223,10 @@ export default { }, handleEdit(record) { - console.log('编辑', this.queryParam.dataType) - // this.$refs.modalForm.eidt(record, this.queryParam.dataType); - // this.$refs.modalForm.title = "配置"; this.$refs.subPage.queryParam.tableName = record.tableName this.$refs.subPage.queryParam.schemaName = record.schemaName + this.$refs.subPage.shipModel = this.queryParam.shipModel + this.$refs.subPage.shipNumber = this.queryParam.shipNumber this.$refs.subPage.datetypeF = this.queryParam.dataType this.$refs.subPage.title = "配置"; this.$refs.subPage.pagevisible = true diff --git a/src/views/datawashing/dataformatsRules/rulesModel.vue b/src/views/datawashing/dataformatsRules/rulesModel.vue index a399826..48346e7 100644 --- a/src/views/datawashing/dataformatsRules/rulesModel.vue +++ b/src/views/datawashing/dataformatsRules/rulesModel.vue @@ -70,8 +70,8 @@ export default { // this.loadData(); }, methods: { - getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + getQuerytableColumns(dataType, tableName,shipModel,shipNumber) { + querytableColumns({ dataType: dataType, tableName: tableName,shipModel:shipModel,shipNumber:shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { @@ -91,8 +91,8 @@ export default { } }, - add(schemaName,tableName, dataType) { - this.getQuerytableColumns(dataType, tableName) + add(schemaName,tableName, dataType,shipModel,shipNumber) { + this.getQuerytableColumns(dataType, tableName,shipModel,shipNumber) this.form = { tableName: tableName, transfFileds: null, @@ -102,7 +102,7 @@ export default { this.checkedList = [] this.visible = true; }, - eidt(record, dataType1) { + eidt(record, dataType,shipModel,shipNumber) { if (record.id) { queryById({ id: record.id }).then(res => { if (res.code == 200) { @@ -119,7 +119,7 @@ export default { schemaName:record.schemaName } } - this.getQuerytableColumns(dataType1, record.tableName) + this.getQuerytableColumns(dataType, record.tableName,shipModel,shipNumber) this.visible = true; }, close() { diff --git a/src/views/datawashing/dataformatsRules/subPage.vue b/src/views/datawashing/dataformatsRules/subPage.vue index 8decabf..8e5fa90 100644 --- a/src/views/datawashing/dataformatsRules/subPage.vue +++ b/src/views/datawashing/dataformatsRules/subPage.vue @@ -59,8 +59,11 @@ export default { title: '', datetypeF: '', pagevisible: false, + shipModel:'', + shipNumber:'', queryParam: { - tableName: null + tableName: null, + schemaName:null }, dataSource: [], columns: [ @@ -117,11 +120,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.eidt(record, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "编辑"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/datatypeConversionRules/index.vue b/src/views/datawashing/datatypeConversionRules/index.vue index 615134c..5269172 100644 --- a/src/views/datawashing/datatypeConversionRules/index.vue +++ b/src/views/datawashing/datatypeConversionRules/index.vue @@ -10,16 +10,34 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + - + {{ item.cnName }} - + @@ -75,10 +93,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -114,7 +134,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -131,16 +154,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -173,6 +228,8 @@ export default { // this.$refs.modalForm.title = "配置"; this.$refs.subPage.queryParam.tableName = record.tableName this.$refs.subPage.queryParam.schemaName = record.schemaName + this.$refs.subPage.shipModel = this.queryParam.shipModel + this.$refs.subPage.shipNumber = this.queryParam.shipNumber this.$refs.subPage.datetypeF = this.queryParam.dataType this.$refs.subPage.title = "配置"; this.$refs.subPage.pagevisible = true diff --git a/src/views/datawashing/datatypeConversionRules/rulesModel.vue b/src/views/datawashing/datatypeConversionRules/rulesModel.vue index c324eef..c7355ba 100644 --- a/src/views/datawashing/datatypeConversionRules/rulesModel.vue +++ b/src/views/datawashing/datatypeConversionRules/rulesModel.vue @@ -77,8 +77,8 @@ export default { // this.loadData(); }, methods: { - getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + getQuerytableColumns(dataType, tableName,shipModel,shipNumber) { + querytableColumns({ dataType: dataType, tableName: tableName,shipModel:shipModel,shipNumber:shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { @@ -98,8 +98,8 @@ export default { } }, - add(schemaName,tableName, dataType) { - this.getQuerytableColumns(dataType, tableName) + add(schemaName,tableName, dataType,shipModel,shipNumber) { + this.getQuerytableColumns(dataType, tableName,shipModel,shipNumber) this.form = { tableName: tableName, columnName: null, @@ -109,7 +109,7 @@ export default { } this.visible = true; }, - eidt(record, dataType1) { + eidt(record, dataType,shipModel,shipNumber) { console.log('sfdsafa',record, dataType1) if (record.id) { queryById({ id: record.id }).then(res => { @@ -125,7 +125,7 @@ export default { schemaName:record.schemaName } } - this.getQuerytableColumns(dataType1, record.tableName) + this.getQuerytableColumns(dataType, record.tableName,shipModel,shipNumber) this.visible = true; }, close() { diff --git a/src/views/datawashing/datatypeConversionRules/subPage.vue b/src/views/datawashing/datatypeConversionRules/subPage.vue index f17a862..026084f 100644 --- a/src/views/datawashing/datatypeConversionRules/subPage.vue +++ b/src/views/datawashing/datatypeConversionRules/subPage.vue @@ -62,8 +62,11 @@ export default { title: '', datetypeF: '', pagevisible: false, + shipModel:'', + shipNumber:'', queryParam: { - tableName: null + tableName: null, + schemaName:null }, dataSource: [], columns: [ @@ -126,11 +129,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.eidt(record, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "编辑"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/deEmphasisRules/index.vue b/src/views/datawashing/deEmphasisRules/index.vue index 21cc6c5..b54779a 100644 --- a/src/views/datawashing/deEmphasisRules/index.vue +++ b/src/views/datawashing/deEmphasisRules/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,7 +37,7 @@ - + @@ -80,10 +98,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -136,7 +156,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -153,16 +176,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -189,11 +244,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.dataType); + this.$refs.modalForm.add(this.queryParam); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.queryParam.dataType); + this.$refs.modalForm.eidt(record, this.queryParam); this.$refs.modalForm.title = "配置"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue index f2ef248..5a73f14 100644 --- a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue +++ b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue @@ -83,7 +83,7 @@ export default { }, methods: { getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + querytableColumns({ dataType: dataType.dataType, tableName: tableName,shipModel:dataType.shipModel,shipNumber:dataType.shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { diff --git a/src/views/datawashing/missingvalueRules/index.vue b/src/views/datawashing/missingvalueRules/index.vue index 470495a..09162d9 100644 --- a/src/views/datawashing/missingvalueRules/index.vue +++ b/src/views/datawashing/missingvalueRules/index.vue @@ -10,24 +10,36 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + - + {{ item.cnName }} - + - + @@ -82,10 +94,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -160,7 +174,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -177,16 +194,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() diff --git a/src/views/datawashing/tempfive/index.vue b/src/views/datawashing/tempfive/index.vue index 41eb33e..1e6a374 100644 --- a/src/views/datawashing/tempfive/index.vue +++ b/src/views/datawashing/tempfive/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,17 +37,17 @@ - + - + - + 查询 - + @@ -80,10 +98,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -130,7 +150,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -147,16 +170,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(key) { this.queryParam.dataType = key this.getQueryPage() @@ -183,11 +238,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.dataType); + this.$refs.modalForm.add(this.queryParam); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.queryParam.dataType); + this.$refs.modalForm.eidt(record, this.queryParam); this.$refs.modalForm.title = "配置"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/tempfive/rulesModel.vue b/src/views/datawashing/tempfive/rulesModel.vue index 4ca1143..95b1095 100644 --- a/src/views/datawashing/tempfive/rulesModel.vue +++ b/src/views/datawashing/tempfive/rulesModel.vue @@ -69,7 +69,7 @@ export default { }, methods: { getQuerytableColumns(dataType) { - getTables({dataType: dataType}).then(res => { + getTables({dataType: dataType.dataType,shipModel:dataType.shipModel,shipNumber:dataType.shipNumber}).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { diff --git a/src/views/datawashing/tempfour/index.vue b/src/views/datawashing/tempfour/index.vue index 09895a3..5e63b09 100644 --- a/src/views/datawashing/tempfour/index.vue +++ b/src/views/datawashing/tempfour/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,9 +37,9 @@ - + - + @@ -75,10 +93,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -114,7 +134,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -131,16 +154,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -173,6 +228,8 @@ export default { // this.$refs.modalForm.title = "配置"; this.$refs.subPage.queryParam.tableName = record.tableName this.$refs.subPage.queryParam.schemaName = record.schemaName + this.$refs.subPage.shipModel = this.queryParam.shipModel + this.$refs.subPage.shipNumber = this.queryParam.shipNumber this.$refs.subPage.datetypeF = this.queryParam.dataType this.$refs.subPage.title = "配置"; this.$refs.subPage.pagevisible = true diff --git a/src/views/datawashing/tempfour/rulesModel.vue b/src/views/datawashing/tempfour/rulesModel.vue index ec200b1..aeb31a2 100644 --- a/src/views/datawashing/tempfour/rulesModel.vue +++ b/src/views/datawashing/tempfour/rulesModel.vue @@ -79,8 +79,8 @@ export default { created() { }, methods: { - getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + getQuerytableColumns(dataType, tableName,shipModel,shipNumber) { + querytableColumns({ dataType: dataType, tableName: tableName,shipModel:shipModel,shipNumber:shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { @@ -93,7 +93,7 @@ export default { } }) }, - add(schemaName,tableName, dataType) { + add(schemaName,tableName, dataType,shipModel,shipNumber) { this.form = { tableName: tableName, strategy: null, @@ -104,9 +104,9 @@ export default { }, this.visible = true; this.dataType = dataType - this.getQuerytableColumns(dataType, tableName) + this.getQuerytableColumns(dataType, tableName,shipModel,shipNumber) }, - eidt(record, dataType) { + eidt(record, dataType,shipModel,shipNumber) { if (record.id) { queryById({ id: record.id }).then(res => { if (res.code == 200) { @@ -124,7 +124,7 @@ export default { schemaName:record.schemaName } } - this.getQuerytableColumns(dataType, record.tableName) + this.getQuerytableColumns(dataType, record.tableName,shipModel,shipNumber) this.visible = true; }, diff --git a/src/views/datawashing/tempfour/subPage.vue b/src/views/datawashing/tempfour/subPage.vue index a452f75..6f18f2a 100644 --- a/src/views/datawashing/tempfour/subPage.vue +++ b/src/views/datawashing/tempfour/subPage.vue @@ -61,8 +61,11 @@ export default { title: '', datetypeF: '', pagevisible: false, + shipModel:'', + shipNumber:'', queryParam: { - tableName: null + tableName: null, + schemaName:null }, dataSource: [], columns: [ @@ -129,11 +132,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.eidt(record, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "编辑"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/tempone/index.vue b/src/views/datawashing/tempone/index.vue index b18d18b..e579312 100644 --- a/src/views/datawashing/tempone/index.vue +++ b/src/views/datawashing/tempone/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,7 +37,7 @@ - + @@ -75,10 +93,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -114,7 +134,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -131,16 +154,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -173,6 +228,8 @@ export default { // this.$refs.modalForm.title = "配置"; this.$refs.subPage.queryParam.tableName = record.tableName this.$refs.subPage.queryParam.schemaName = record.schemaName + this.$refs.subPage.shipModel = this.queryParam.shipModel + this.$refs.subPage.shipNumber = this.queryParam.shipNumber this.$refs.subPage.datetypeF = this.queryParam.dataType this.$refs.subPage.title = "配置"; this.$refs.subPage.pagevisible = true diff --git a/src/views/datawashing/tempone/rulesModel.vue b/src/views/datawashing/tempone/rulesModel.vue index 7f7e1f4..b3d2868 100644 --- a/src/views/datawashing/tempone/rulesModel.vue +++ b/src/views/datawashing/tempone/rulesModel.vue @@ -78,8 +78,8 @@ export default { // this.loadData(); }, methods: { - getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + getQuerytableColumns(dataType, tableName,shipModel,shipNumber) { + querytableColumns({ dataType: dataType, tableName: tableName,shipModel:shipModel,shipNumber:shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { @@ -99,8 +99,8 @@ export default { } }, - add(schemaName,tableName, dataType) { - this.getQuerytableColumns(dataType, tableName) + add(schemaName,tableName, dataType,shipModel,shipNumber) { + this.getQuerytableColumns(dataType, tableName,shipModel,shipNumber) this.form = { tableName: tableName, field: null, @@ -111,7 +111,7 @@ export default { this.checkedList = [] this.visible = true; }, - eidt(record, dataType1) { + eidt(record, dataType,shipModel,shipNumber) { if (record.id) { queryById({ id: record.id }).then(res => { if (res.code == 200) { @@ -128,7 +128,7 @@ export default { schemaName:record.schemaName } } - this.getQuerytableColumns(dataType1, record.tableName) + this.getQuerytableColumns(dataType, record.tableName,shipModel,shipNumber) this.visible = true; }, close() { diff --git a/src/views/datawashing/tempone/subPage.vue b/src/views/datawashing/tempone/subPage.vue index cfc9fe4..6121cd5 100644 --- a/src/views/datawashing/tempone/subPage.vue +++ b/src/views/datawashing/tempone/subPage.vue @@ -63,8 +63,11 @@ export default { title: '', datetypeF: '', pagevisible: false, + shipModel:'', + shipNumber:'', queryParam: { - tableName: null + tableName: null, + schemaName:null }, dataSource: [], columns: [ @@ -126,12 +129,12 @@ export default { } }) }, - handleAdd() { - this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + handleAdd() { + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.eidt(record, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "编辑"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/tempthree/index.vue b/src/views/datawashing/tempthree/index.vue index ad74f68..4af140a 100644 --- a/src/views/datawashing/tempthree/index.vue +++ b/src/views/datawashing/tempthree/index.vue @@ -10,6 +10,24 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + @@ -19,9 +37,9 @@ - + - + @@ -75,10 +93,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -114,7 +134,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -131,16 +154,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage() @@ -173,6 +228,8 @@ export default { // this.$refs.modalForm.title = "配置"; this.$refs.subPage.queryParam.tableName = record.tableName this.$refs.subPage.queryParam.schemaName = record.schemaName + this.$refs.subPage.shipModel = this.queryParam.shipModel + this.$refs.subPage.shipNumber = this.queryParam.shipNumber this.$refs.subPage.datetypeF = this.queryParam.dataType this.$refs.subPage.title = "配置"; this.$refs.subPage.pagevisible = true diff --git a/src/views/datawashing/tempthree/rulesModel.vue b/src/views/datawashing/tempthree/rulesModel.vue index d3c0e4c..135f8a7 100644 --- a/src/views/datawashing/tempthree/rulesModel.vue +++ b/src/views/datawashing/tempthree/rulesModel.vue @@ -80,8 +80,8 @@ export default { created() { }, methods: { - getQuerytableColumns(dataType, tableName) { - querytableColumns({ dataType: dataType, tableName: tableName }).then(res => { + getQuerytableColumns(dataType, tableName,shipModel,shipNumber) { + querytableColumns({ dataType: dataType, tableName: tableName,shipModel:shipModel,shipNumber:shipNumber }).then(res => { if (res.code == 200) { this.treeData = [] res.result.forEach(element => { @@ -97,7 +97,7 @@ export default { handleChange(value) { this.getQuerytableColumns(this.dataType, this.form.tableName) }, - add(schemaName,tableName, dataType) { + add(schemaName,tableName, dataType,shipModel,shipNumber) { this.form = { id: null, tableName: tableName, @@ -108,9 +108,9 @@ export default { this.dataType = dataType this.checkedList =[] this.visible = true; - this.getQuerytableColumns(dataType, tableName) + this.getQuerytableColumns(dataType, tableName,shipModel,shipNumber) }, - eidt(record, dataType) { + eidt(record, dataType,shipModel,shipNumber) { this.form = { id: null, tableName: record.tableName, @@ -127,7 +127,7 @@ export default { }) } this.dataType = dataType - this.getQuerytableColumns(dataType, record.tableName) + this.getQuerytableColumns(dataType, record.tableName,shipModel,shipNumber) this.visible = true; }, close() { diff --git a/src/views/datawashing/tempthree/subPage.vue b/src/views/datawashing/tempthree/subPage.vue index 937f006..1426465 100644 --- a/src/views/datawashing/tempthree/subPage.vue +++ b/src/views/datawashing/tempthree/subPage.vue @@ -117,11 +117,11 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.eidt(record, this.datetypeF,this.shipModel,this.shipNumber); this.$refs.modalForm.title = "编辑"; }, handleRemove(recordId) { diff --git a/src/views/datawashing/temptwo/index.vue b/src/views/datawashing/temptwo/index.vue index f7577f9..5e6e91c 100644 --- a/src/views/datawashing/temptwo/index.vue +++ b/src/views/datawashing/temptwo/index.vue @@ -10,24 +10,36 @@ + + + + + {{ item }} + + + + + + + + + {{ item }} + + + + - + {{ item.cnName }} - + - + @@ -82,10 +94,12 @@ export default { loading: false, // 查询条件 queryParam: { - dataType: 'biandui', + dataType: '', msgName: null, pageNum: 1, - pageSize: 10 + pageSize: 10, + shipModel:'', + shipNumber:'' }, pagination: { defaultCurrent: 1, // 默认当前页数 @@ -160,7 +174,10 @@ export default { align: "center", scopedSlots: { customRender: 'action' }, }, - ] + ], + shipModel:[], + shipNumber:[], + existingDataTypes:{} } }, @@ -177,16 +194,48 @@ export default { getDataType() { getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { - this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL - if(res.result.result.DATA_CONN_ORIGINAL.length > 0){ - this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName - } - this.getQueryPage() + this.existingDataTypes = res.result.result.original + var ship = Object.keys(this.existingDataTypes) + ship.forEach((element, index) => { + this.shipModel.push(element); + }); + var number = Object.keys(this.existingDataTypes[this.shipModel[0]]) + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[this.shipModel[0]][this.shipNumber[0]] + this.queryParam.shipModel = this.shipModel[0] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() } else { - this.$message.warning(res.message); + this.$message.warning(res.message); } }); }, + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ); + }, + changeshipModel(value) { + this.queryParam.shipModel = value + var number = Object.keys(this.existingDataTypes[value]) + this.shipNumber = [] + number.forEach((element, index) => { + this.shipNumber.push(element); + }); + this.dataTypeList =this.existingDataTypes[value][this.shipNumber[0]] + this.queryParam.shipNumber = this.shipNumber[0] + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, + changeshipNumber(value) { + this.dataTypeList =this.existingDataTypes[this.queryParam.shipModel][value] + this.queryParam.shipNumber = value + this.queryParam.dataType = this.dataTypeList[0].enName + this.getQueryPage() + }, handleTypeChange(value) { this.queryParam.dataType = value this.getQueryPage()