diff --git a/src/views/datawashing/dataformatsRules/index.vue b/src/views/datawashing/dataformatsRules/index.vue index 3c782f2..4432938 100644 --- a/src/views/datawashing/dataformatsRules/index.vue +++ b/src/views/datawashing/dataformatsRules/index.vue @@ -172,6 +172,7 @@ export default { // 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.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 0a1d73a..6a842d4 100644 --- a/src/views/datawashing/dataformatsRules/rulesModel.vue +++ b/src/views/datawashing/dataformatsRules/rulesModel.vue @@ -47,7 +47,8 @@ export default { form: { tableName: null, transfFileds: null, - transfStrategy: null + transfStrategy: null, + schemaName:"" }, rules: { tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], @@ -91,12 +92,13 @@ export default { } }, - add(tableName, dataType) { + add(schemaName,tableName, dataType) { this.getQuerytableColumns(dataType, tableName) this.form = { tableName: tableName, transfFileds: null, - transfStrategy: null + transfStrategy: null, + schemaName :schemaName } this.checkedList = [] this.visible = true; @@ -114,7 +116,8 @@ export default { id: null, tableName: record.tableName, transfFileds: null, - transfStrategy: null + transfStrategy: null, + schemaName:record.schemaName } } this.getQuerytableColumns(dataType1, record.tableName) diff --git a/src/views/datawashing/dataformatsRules/subPage.vue b/src/views/datawashing/dataformatsRules/subPage.vue index 99b3a1a..b1fd5ef 100644 --- a/src/views/datawashing/dataformatsRules/subPage.vue +++ b/src/views/datawashing/dataformatsRules/subPage.vue @@ -117,7 +117,7 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add( this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { diff --git a/src/views/datawashing/datatypeConversionRules/index.vue b/src/views/datawashing/datatypeConversionRules/index.vue index 82122f0..e751b89 100644 --- a/src/views/datawashing/datatypeConversionRules/index.vue +++ b/src/views/datawashing/datatypeConversionRules/index.vue @@ -172,6 +172,7 @@ export default { // 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.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 f85e687..c324eef 100644 --- a/src/views/datawashing/datatypeConversionRules/rulesModel.vue +++ b/src/views/datawashing/datatypeConversionRules/rulesModel.vue @@ -54,7 +54,8 @@ export default { tableName: null, columnName: null, dataType: null, - dataPrecision: null + dataPrecision: null, + schemaName:null }, rules: { tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], @@ -97,13 +98,14 @@ export default { } }, - add(tableName, dataType) { + add(schemaName,tableName, dataType) { this.getQuerytableColumns(dataType, tableName) this.form = { tableName: tableName, columnName: null, dataType: null, - dataPrecision: null + dataPrecision: null, + schemaName:schemaName } this.visible = true; }, @@ -119,7 +121,8 @@ export default { tableName: record.tableName, columnName: null, dataType: null, - dataPrecision: null + dataPrecision: null, + schemaName:record.schemaName } } this.getQuerytableColumns(dataType1, record.tableName) diff --git a/src/views/datawashing/datatypeConversionRules/subPage.vue b/src/views/datawashing/datatypeConversionRules/subPage.vue index 8c85b18..f17a862 100644 --- a/src/views/datawashing/datatypeConversionRules/subPage.vue +++ b/src/views/datawashing/datatypeConversionRules/subPage.vue @@ -126,7 +126,7 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add( this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { diff --git a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue index 4751373..f2ef248 100644 --- a/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue +++ b/src/views/datawashing/deEmphasisRules/modules/rulesModel.vue @@ -60,7 +60,8 @@ export default { form: { tableName: null, duplicationType: 1, - judgmentField: null + judgmentField: null, + schemaName:null }, rules: { tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], @@ -106,7 +107,8 @@ export default { this.form = { tableName: null, duplicationType: 1, - judgmentField: null + judgmentField: null, + schemaName:null } this.dataType = dataType this.checkedList =[] @@ -117,7 +119,8 @@ export default { id: null, tableName: record.tableName, duplicationType: 1, - judgmentField: null + judgmentField: null, + schemaName:record.schemaName } if (record.id) { queryById({ id: record.id }).then(res => { diff --git a/src/views/datawashing/missingvalueRules/rulesModel.vue b/src/views/datawashing/missingvalueRules/rulesModel.vue index a54e4e2..ba4190f 100644 --- a/src/views/datawashing/missingvalueRules/rulesModel.vue +++ b/src/views/datawashing/missingvalueRules/rulesModel.vue @@ -57,7 +57,8 @@ export default { tableName: null, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName:null }, rules: { tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], @@ -84,7 +85,8 @@ export default { tableName: null, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName:null } this.visible = true; }, @@ -101,7 +103,8 @@ export default { tableName: record.tableName, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName:record.schemaName } } this.visible = true; diff --git a/src/views/datawashing/tempfive/rulesModel.vue b/src/views/datawashing/tempfive/rulesModel.vue index 070d068..4ca1143 100644 --- a/src/views/datawashing/tempfive/rulesModel.vue +++ b/src/views/datawashing/tempfive/rulesModel.vue @@ -88,7 +88,8 @@ export default { add(dataType) { this.form = { tableName: null, - mergTables: [] + mergTables: [], + schemaName:record.schemaName } this.dataType = dataType this.visible = true; @@ -98,7 +99,8 @@ export default { this.form = { id: null, tableName: record.tableName, - mergTables: null + mergTables: null, + schemaName:record.schemaName } if (record.id) { queryById({ id: record.id }).then(res => { diff --git a/src/views/datawashing/tempfour/index.vue b/src/views/datawashing/tempfour/index.vue index b7e6b74..f115987 100644 --- a/src/views/datawashing/tempfour/index.vue +++ b/src/views/datawashing/tempfour/index.vue @@ -172,6 +172,7 @@ export default { // 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.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 098a428..846423c 100644 --- a/src/views/datawashing/tempfour/rulesModel.vue +++ b/src/views/datawashing/tempfour/rulesModel.vue @@ -93,13 +93,14 @@ export default { } }) }, - add(tableName, dataType) { + add(schemaName,tableName, dataType) { this.form = { tableName: tableName, strategy: null, maxVal: null, minVal: null, - field:null + field:null, + schemaName:schemaName }, this.visible = true; this.dataType = dataType @@ -119,7 +120,8 @@ export default { maxVal: null, minVal: null, field:null, - tableName: record.tableName + tableName: record.tableName, + schemaName:record.schemaName } } this.getQuerytableColumns(dataType, record.tableName) diff --git a/src/views/datawashing/tempfour/subPage.vue b/src/views/datawashing/tempfour/subPage.vue index f82e70f..a452f75 100644 --- a/src/views/datawashing/tempfour/subPage.vue +++ b/src/views/datawashing/tempfour/subPage.vue @@ -129,13 +129,13 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add( this.queryParam.tableName, this.datetypeF); - this.$refs.modalForm.title = "新增"; - }, - handleEdit(record) { - this.$refs.modalForm.eidt(record, this.datetypeF); - this.$refs.modalForm.title = "编辑"; - }, + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.title = "新增"; + }, + handleEdit(record) { + this.$refs.modalForm.eidt(record, this.datetypeF); + this.$refs.modalForm.title = "编辑"; + }, handleRemove(recordId) { console.log('dfs', recordId) const _that = this diff --git a/src/views/datawashing/tempone/rulesModel.vue b/src/views/datawashing/tempone/rulesModel.vue index a54e4e2..5ddb0c2 100644 --- a/src/views/datawashing/tempone/rulesModel.vue +++ b/src/views/datawashing/tempone/rulesModel.vue @@ -84,7 +84,8 @@ export default { tableName: null, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName: null } this.visible = true; }, @@ -101,7 +102,8 @@ export default { tableName: record.tableName, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName: record.schemaName } } this.visible = true; diff --git a/src/views/datawashing/tempthree/index.vue b/src/views/datawashing/tempthree/index.vue index f6580b4..ac370b5 100644 --- a/src/views/datawashing/tempthree/index.vue +++ b/src/views/datawashing/tempthree/index.vue @@ -172,6 +172,7 @@ export default { // 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.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 c1248a3..d3c0e4c 100644 --- a/src/views/datawashing/tempthree/rulesModel.vue +++ b/src/views/datawashing/tempthree/rulesModel.vue @@ -97,12 +97,13 @@ export default { handleChange(value) { this.getQuerytableColumns(this.dataType, this.form.tableName) }, - add(tableName, dataType) { + add(schemaName,tableName, dataType) { this.form = { id: null, tableName: tableName, type: 1, - fields: null + fields: null, + schemaName:schemaName } this.dataType = dataType this.checkedList =[] @@ -114,7 +115,8 @@ export default { id: null, tableName: record.tableName, type: 1, - fields: null + fields: null, + schemaName:record.schemaName } if (record.id) { queryById({ id: record.id }).then(res => { diff --git a/src/views/datawashing/tempthree/subPage.vue b/src/views/datawashing/tempthree/subPage.vue index f5895cd..937f006 100644 --- a/src/views/datawashing/tempthree/subPage.vue +++ b/src/views/datawashing/tempthree/subPage.vue @@ -117,7 +117,7 @@ export default { }) }, handleAdd() { - this.$refs.modalForm.add( this.queryParam.tableName, this.datetypeF); + this.$refs.modalForm.add(this.queryParam.schemaName,this.queryParam.tableName, this.datetypeF); this.$refs.modalForm.title = "新增"; }, handleEdit(record) { diff --git a/src/views/datawashing/temptwo/rulesModel.vue b/src/views/datawashing/temptwo/rulesModel.vue index a54e4e2..fbfd20f 100644 --- a/src/views/datawashing/temptwo/rulesModel.vue +++ b/src/views/datawashing/temptwo/rulesModel.vue @@ -57,7 +57,8 @@ export default { tableName: null, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName: null }, rules: { tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], @@ -101,7 +102,8 @@ export default { tableName: record.tableName, stringStrategy: null, digitStrategy: null, - dateTimeStrategy: null + dateTimeStrategy: null, + schemaName: record.schemaName } } this.visible = true;