Merge remote-tracking branch 'origin/master'

master
chaiyapeng 2024-08-23 22:36:37 +08:00
commit a1f4b76e73
1 changed files with 67 additions and 18 deletions

View File

@ -56,9 +56,9 @@
</el-button>
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" append-to-body width="60%">
<el-form :model="sourceAddReq">
<el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline">
<el-form-item label="接入源名称">
<el-input v-model="sourceAddReq.dataResourceName"></el-input>
</el-form-item>
@ -86,25 +86,74 @@
<el-form-item label="数据连接参数">
<el-input v-model="sourceAddReq.connectionParams"></el-input>
</el-form-item>
<el-form-item label="初始化连接数量">
<el-input v-model="sourceAddReq.initLinkNum"></el-input>
</el-form-item>
<el-form-item label="最大连接数量">
<el-input v-model="sourceAddReq.maxLinkNum"></el-input>
</el-form-item>
<el-form-item label="最大等待时间">
<el-input v-model="sourceAddReq.maxWaitTime"></el-input>
</el-form-item>
<el-form-item label="最大等待次数">
<el-input v-model="sourceAddReq.maxWaitTimes"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="sourceAddReq.remark"></el-input>
</el-form-item>
<!-- <el-form-item label="初始化连接数量">-->
<!-- <el-input v-model="sourceAddReq.initLinkNum"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大连接数量">-->
<!-- <el-input v-model="sourceAddReq.maxLinkNum"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大等待时间">-->
<!-- <el-input v-model="sourceAddReq.maxWaitTime"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大等待次数">-->
<!-- <el-input v-model="sourceAddReq.maxWaitTimes"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注">-->
<!-- <el-input v-model="sourceAddReq.remark"></el-input>-->
<!-- </el-form-item>-->
</el-form>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>连接池配置</span>
</div>
<el-form ref="form" :model="sourceAddReq" label-width="120px" :inline="true" class="demo-form-inline">
<el-form-item label="初始连接数量:" prop="initCount">
<el-input v-model="sourceAddReq.initCount" placeholder="初始连接数量"/>
</el-form-item>
<el-form-item label="最大连接数量:" prop="maxCount">
<el-input v-model="sourceAddReq.maxLinkNum" placeholder="最大连接数量"/>
</el-form-item>
<el-form-item label="最大等待时间:" prop="maxTime">
<el-input v-model="sourceAddReq.maxWaitTime" placeholder="最大等待时间"/>
</el-form-item>
<el-form-item label="最大等待次数:" prop="maxFrequency">
<el-input v-model="sourceAddReq.remark" placeholder="最大等待次数"/>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>其他信息</span>
</div>
<el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline">
<!-- <el-form-item label="是否初始化:" prop="status">-->
<!-- <el-radio-group v-model="sourceAddReq.status">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.yes_no"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="备注:">
<el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
</el-form-item>
</el-form>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button @click="textP()"></el-button>
<el-button @click="dialogFormVisible = false"> </el-button>
@ -285,9 +334,9 @@ export default {
}
})
},
insertAdd(){
this.dialogFormVisible=true
},
findSelectSourceList(){
selectSourceList(this.SourceReq).then(res=>{