Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
8334e74a2a
|
@ -226,8 +226,10 @@ import { datasyncqueryPage,
|
||||||
add () {
|
add () {
|
||||||
this.visible =true;
|
this.visible =true;
|
||||||
this.recordId = '';
|
this.recordId = '';
|
||||||
this.testConnBool = false,
|
this.testConnBool = false;
|
||||||
this.getselect();
|
this.getselect();
|
||||||
|
this.selectDataBase = true;
|
||||||
|
this.createSchemaboll = true;
|
||||||
let model = {};
|
let model = {};
|
||||||
model.ip = "";
|
model.ip = "";
|
||||||
model.port = 0;
|
model.port = 0;
|
||||||
|
@ -248,6 +250,9 @@ import { datasyncqueryPage,
|
||||||
this.model = Object.assign({},record);
|
this.model = Object.assign({},record);
|
||||||
this.getselect();
|
this.getselect();
|
||||||
this.recordId = record.id;
|
this.recordId = record.id;
|
||||||
|
this.selectDataBase = true;
|
||||||
|
this.createSchemaboll = true;
|
||||||
|
this.testConnBool = false;
|
||||||
datasyncqueryById({id:record.id}).then((res) => {
|
datasyncqueryById({id:record.id}).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
let model = {};
|
let model = {};
|
||||||
|
@ -347,7 +352,7 @@ import { datasyncqueryPage,
|
||||||
var that = this;
|
var that = this;
|
||||||
if (!err) {
|
if (!err) {
|
||||||
that.confirmLoading = true;
|
that.confirmLoading = true;
|
||||||
datasynccreateSchema({shipModelId:this.datamodel.shipModel,shipNumId:this.datamodel.shipNum,dataTypeId:this.datamodel.dataType}).then((res) => {
|
datasynccreateSchema({shipModelId:this.datamodel.shipModel,shipNumId:this.datamodel.shipNum,dataTypeId:this.datamodel.dataType, dbType:this.datamodel.dbType}).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.createSchemaboll =false;
|
this.createSchemaboll =false;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user