dromara/dbswitch
1
0
Fork 0
mirror of https://gitee.com/dromara/dbswitch.git synced 2025-09-09 21:49:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

!73 version for 1.6.4

Browse Source 
* version for 1.6.4
This commit is contained in:
inrgihc
2022-02-02 15:00:04 +00:00
parent b82cb5e82c
commit b70c454e1d
6 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbswitch-admin-ui/src/router/index.js
View File

@@ -43,7 +43,7 @@ const constantRouter = new Router({
{
path: '/task/schedule',
name: '调度记录',
icon: "el-icon-s-check",
icon: "el-icon-pie-chart",
component: () => import('@/views/task/schedule')
}
]

4
dbswitch-admin-ui/src/views/about/me.vue
View File

@@ -67,6 +67,8 @@
</li>
<li>翰高数据库HighGo
</li>
<li>Apache Hive(只支持为源端)
</li>
</ul>
</div>
</el-card>
@@ -140,7 +142,7 @@ export default {
},
methods: {
handleClick (tab, event) {
console.log(tab, event);
//console.log(tab, event);
}
}
}

17
dbswitch-admin-ui/src/views/connection/list.vue
View File

@@ -4,7 +4,8 @@
<div align="right"
style="margin:10px 5px;"
width="95%">
<el-button type="primary" icon="el-icon-document-add"
<el-button type="primary"
icon="el-icon-document-add"
@click="createFormVisible=true">添加</el-button>
</div>
<el-table :data="tableData"
@@ -21,6 +22,7 @@
min-width="10%"></el-table-column>
<el-table-column prop="url"
label="JDBC连接串"
show-overflow-tooltip
min-width="30%"></el-table-column>
<el-table-column prop="username"
label="账号名称"
@@ -101,7 +103,8 @@
<el-form-item label="连接密码"
label-width="120px"
style="width:85%">
<el-input v-model="queryForm.password"
<el-input type="password"
v-model="queryForm.password"
auto-complete="off"
:readonly=true></el-input>
</el-form-item>
@@ -154,7 +157,6 @@
</el-form-item>
<el-form-item label="账号名称"
label-width="120px"
:required=true
prop="username"
style="width:85%">
<el-input v-model="createform.username"
@@ -163,7 +165,8 @@
<el-form-item label="连接密码"
label-width="120px"
style="width:85%">
<el-input v-model="createform.password"
<el-input type="password"
v-model="createform.password"
auto-complete="off"></el-input>
</el-form-item>
</el-form>
@@ -218,7 +221,6 @@
</el-form-item>
<el-form-item label="账号名称"
label-width="120px"
:required=true
prop="username"
style="width:85%">
<el-input v-model="updateform.username"
@@ -227,7 +229,8 @@
<el-form-item label="连接密码"
label-width="120px"
style="width:85%">
<el-input v-model="updateform.password"
<el-input type="password"
v-model="updateform.password"
auto-complete="off"></el-input>
</el-form-item>
</el-form>
@@ -302,7 +305,7 @@ export default {
],
username: [
{
required: true,
required: false,
message: "连接账号名必须提供",
trigger: "blur"
}

1
dbswitch-admin-ui/src/views/log/access.vue
View File

@@ -93,7 +93,6 @@ export default {
}
},
created () {
console.log("============");
this.loadData();
}
};

51
dbswitch-admin-ui/src/views/task/assignment.vue
View File

@@ -16,6 +16,7 @@
min-width="8%"></el-table-column>
<el-table-column prop="name"
label="名称"
show-overflow-tooltip
min-width="30%"></el-table-column>
<el-table-column prop="scheduleMode"
label="调度"
@@ -165,7 +166,13 @@
label-width="120px"
:required=false
prop="sourceTables"
style="width:65%">
style="width:85%">
<el-tooltip placement="top">
<div slot="content">
当为包含表时，选择所要精确包含的表名，如果不选则代表选择所有；当为排除表时，选择索要精确排除的表名。
</div>
<i class="el-icon-question"></i>
</el-tooltip>
<el-select placeholder="请选择表名"
multiple
v-model="createform.sourceTables">
@@ -214,12 +221,12 @@
prop="batchSize"
style="width:85%">
<el-select v-model="createform.batchSize">
<el-option label="1000"
value="1000"></el-option>
<el-option label="5000"
value="5000"></el-option>
<el-option label="10000"
value="10000"></el-option>
<el-option label=1000
:value=1000></el-option>
<el-option label=5000
:value=5000></el-option>
<el-option label=10000
:value=10000></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -328,9 +335,15 @@
</el-form-item>
<el-form-item label="表名配置"
label-width="120px"
:required=true
:required=false
prop="sourceTables"
style="width:65%">
style="width:85%">
<el-tooltip placement="top">
<div slot="content">
当为包含表时，选择所要精确包含的表名，如果不选则代表选择所有；当为排除表时，选择索要精确排除的表名。
</div>
<i class="el-icon-question"></i>
</el-tooltip>
<el-select placeholder="请选择表名"
multiple
v-model="updateform.sourceTables">
@@ -379,12 +392,12 @@
prop="batchSize"
style="width:85%">
<el-select v-model="updateform.batchSize">
<el-option label="1000"
value="1000"></el-option>
<el-option label="5000"
value="5000"></el-option>
<el-option label="10000"
value="10000"></el-option>
<el-option label=1000
:value=1000></el-option>
<el-option label=5000
:value=5000></el-option>
<el-option label=10000
:value=10000></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -400,8 +413,8 @@
</template>
<script>
export default {
data () {
return {
loading: true,
@@ -423,7 +436,7 @@ export default {
targetConnectionId: 0,
targetDropTable: true,
targetSchema: "",
batchSize: "10000"
batchSize: 5000
},
updateform: {
id: 0,
@@ -439,7 +452,7 @@ export default {
targetConnectionId: 0,
targetDropTable: true,
targetSchema: "",
batchSize: "10000"
batchSize: 5000
},
rules: {
name: [
@@ -508,7 +521,7 @@ export default {
batchSize: [
{
required: true,
type: 'string',
type: 'integer',
message: "必选选择一个批大小",
trigger: "change"
}

24
dbswitch-admin-ui/src/views/task/schedule.vue
View File

@@ -36,12 +36,12 @@
<span>{{ props.row.jobStatus }}</span>
</el-form-item>
<el-form-item label="操作:">
<el-button size="small"
type="danger"
v-if="props.row.status=='1'"
@click="handleCancelJob(props.row.jobId)">
停止
</el-button>
<el-button size="small"
type="danger"
v-if="props.row.status=='1'"
@click="handleCancelJob(props.row.jobId)">
停止
</el-button>
</el-form-item>
<el-form-item label="异常日志:">
<el-input type="textarea"
@@ -152,7 +152,7 @@ export default {
this.taskId = taskId;
this.loadJobsData();
},
handleCancelJob: function(jobId){
handleCancelJob: function (jobId) {
this.$http.get(
"/dbswitch/admin/api/v1/ops/job/cancel?id=" + jobId
).then(res => {
@@ -205,7 +205,11 @@ export default {
.container {
display: flex;
height: 600px;
height: 100%;
}
.container > * {
float: left; /* 水平排列 */
}
.container .navsBox {
@@ -219,6 +223,9 @@ export default {
.container .navsBox ul li {
list-style: none;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrop;
cursor: pointer; /*鼠标悬停变小手*/
padding: 10px 0;
border-bottom: 1px solid #e0e0e0;
@@ -232,5 +239,6 @@ export default {
.container .contentBox {
padding: 10px;
width: calc(100% - 250px);
}
</style>