Merge remote-tracking branch 'origin/main'

This commit is contained in:
hekaiyu 2025-05-26 00:05:41 +08:00
commit 8334e74a2a

View File

@ -226,8 +226,10 @@ import { datasyncqueryPage,
add () {
this.visible =true;
this.recordId = '';
this.testConnBool = false,
this.testConnBool = false;
this.getselect();
this.selectDataBase = true;
this.createSchemaboll = true;
let model = {};
model.ip = "";
model.port = 0;
@ -248,6 +250,9 @@ import { datasyncqueryPage,
this.model = Object.assign({},record);
this.getselect();
this.recordId = record.id;
this.selectDataBase = true;
this.createSchemaboll = true;
this.testConnBool = false;
datasyncqueryById({id:record.id}).then((res) => {
if (res.success) {
let model = {};
@ -347,7 +352,7 @@ import { datasyncqueryPage,
var that = this;
if (!err) {
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) {
this.createSchemaboll =false;
} else {