Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ETL-admin
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
莫晓莉
ETL-admin
Commits
b68b010e
Commit
b68b010e
authored
Mar 24, 2021
by
李耀琨
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
66afb597
241d7954
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
252 additions
and
27 deletions
+252
-27
src/views/dialogs-components/global/database-choose/index.js
+3
-0
src/views/dialogs-components/global/database-choose/main.vue
+175
-0
src/views/dialogs-components/global/establish/main.vue
+47
-15
src/views/kettle/home.vue
+4
-4
src/views/output-dialog/table-out.vue
+23
-8
No files found.
src/views/dialogs-components/global/database-choose/index.js
0 → 100644
View file @
b68b010e
import
main
from
'./main.vue'
export
default
main
\ No newline at end of file
src/views/dialogs-components/global/database-choose/main.vue
0 → 100644
View file @
b68b010e
<
template
>
<div>
<el-form-item
label=
"数据库连接:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"14"
>
<el-select
style=
"width: 100%"
v-model=
"selectName"
placeholder=
"请选择选择数据库连接"
@
focus=
"clickFunc"
@
change=
"selectNameFunc"
>
<el-option
v-for=
"(item,index) in namesList"
:key=
"index"
:label=
"item.name"
:value=
"item.name"
></el-option>
</el-select>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
@
click
.
native=
"editDataBaseModal()"
>
编辑
</el-button></el-col
>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
@
click
.
native=
"newAdd"
>
新建
</el-button></el-col
>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
>
向导
</el-button></el-col
>
</el-row>
</el-form-item>
<el-form-item
label=
"目的模式:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"form.name"
></el-input>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
@
click
.
native=
"scanTree"
>
浏览
</el-button></el-col
>
</el-row>
</el-form-item>
<el-form-item
label=
"目标表:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"form.name"
></el-input>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
@
click
.
native=
"scanTree"
>
浏览
</el-button></el-col
>
</el-row>
</el-form-item>
<estab-dialog
ref=
"establishDia"
:dialogVisibleFourth
.
sync=
'dialogVisibleFourth'
@
getSonValue=
"getSonValue"
:listNames=
"listNames"
></estab-dialog>
</div>
</
template
>
<
script
>
// import { exptree,expRespository,download } from "@/api/kettle/file";
import
{
types
,
getLinkList
,
accessMethod
,
//获取连接方式列表
accessData
,
//获取连接类型
create
,
listNames
,
//获取已经创建的数据库列表
database
,
//编辑数据库信息
check
,
//编辑数据库
loginRepository
,
//连接数据库
addRepository
,
//资源库信息
}
from
"@/api/kettle/link"
;
export
default
{
name
:
"database-choose"
,
data
()
{
return
{
dialogVisibleFourth
:
false
,
namesList
:[],
selectName
:
''
,
//当前选中的下拉框的数据
dataBaseName
:
''
,
curNode
:[]
}
},
props
:
{
form
:
Object
},
created
()
{
this
.
listNames
();
},
methods
:
{
//获取新建弹窗返回来的值
getSonValue
(
res
){
if
(
typeof
(
res
)
==
'object'
){
this
.
dataBaseName
=
res
.
name
console
.
log
(
'接收子组件的值1111111----'
,
this
.
dataBaseName
);
}
else
if
(
res
instanceof
Array
){
console
.
log
(
'接收子组件的值55555----'
,
this
.
dataBaseName
);
this
.
curNode
=
res
;
}
else
if
(
typeof
(
res
)
==
'boolean'
){
this
.
dialogVisibleFourth
=
res
;
console
.
log
(
'接收子组件的值2222222----'
,
this
.
dialogVisibleFourth
);
}
// this.dataBaseName=res[0];
// this.dialogVisibleFourth=[1];
console
.
log
(
'接收子组件的值----'
,
res
,
typeof
(
res
));
},
//查询已经建立的所有数据库列表
listNames
(){
listNames
().
then
(
res
=>
{
if
(
res
)
{
console
.
log
(
'获取所有已经创建的数据库列表:'
,
res
);
this
.
namesList
=
res
;
}
else
{
this
.
$message
.
error
(
res
.
errMsg
)
}
})
},
// 新增数据库
newAdd
(){
this
.
dialogVisibleFourth
=
true
;
this
.
$refs
.
establishDia
.
database
();
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
},
//选择数据库编辑
selectNameFunc
(
e
){
console
.
log
(
'当前选中的数'
,
e
);
console
.
log
(
'当前选中的数-==='
,
this
.
selectName
);
},
//点击选择获取已经创建的数据库列表
clickFunc
(){
this
.
listNames
();
},
// 编辑
editDataBaseModal
(){
if
(
this
.
selectName
){
this
.
dialogVisibleFourth
=
true
;
}
this
.
$refs
.
establishDia
.
database
(
this
.
selectName
);
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
},
//浏览
scanTree
(){
if
(
this
.
selectName
){
this
.
$refs
.
establishDia
.
database
(
this
.
selectName
);
console
.
log
(
'当前选中数据库***************'
,
this
.
dataBaseName
);
if
(
this
.
dataBaseName
){
this
.
$refs
.
establishDia
.
scanDialogOpen
();
}
}
else
{
this
.
$message
.
error
(
'请选择数据库'
)
}
}
},
// 监听编号好后获取选择的数据库的树形里列表
watch
:
{
dataBaseName
:{
handler
(
newValue
,
oldValue
)
{
console
.
log
(
'obj changed'
);
if
(
newValue
){
this
.
$refs
.
establishDia
.
scanDialogOpen
();
}
},
deep
:
true
}
},
};
</
script
>
<
style
>
/* .type-checked {
background-color: #8888ff;
color: #fff;
} */
</
style
>
\ No newline at end of file
src/views/dialogs-components/global/establish/main.vue
View file @
b68b010e
<
template
>
<div>
<div
>
<el-dialog
title=
"数据库连接"
:visible
.
sync=
"dialogVisibleFourth"
width=
"800px"
top=
"5%"
:before-close=
"handleCloseFourth"
append-to-body
>
append-to-body
>
<div
style=
"display: flex"
>
<div
class=
"left-container"
>
<div
class=
"left-container
mybox
"
>
<ul
class=
"infinite-list"
>
<li
@
click=
"chooseType(index)"
...
...
@@ -32,9 +31,9 @@
<el-form-item
label=
"连接名称"
prop=
"name"
>
<el-input
v-model=
"createModel.name"
></el-input>
</el-form-item>
<div
style=
"display: flex"
>
<div
style=
"display: flex
;margin-top:15px;
"
>
<div
class=
"choose-container"
>
<div>
<div
class=
"mybox"
>
<div
class=
"boxtitle"
>
连接类型
</div>
<ul
class=
"leftv scroll-y"
>
<li
...
...
@@ -53,7 +52,7 @@
</li>
</ul>
</div>
<div
style=
"margin-top: 15px"
>
<div
class=
"mybox"
style=
"margin-top: 15px"
>
<div
class=
"boxtitle"
>
连接方式
</div>
<ul
class=
"rightv scroll-y"
>
<li
...
...
@@ -216,8 +215,6 @@
</div>
<el-input
type=
"password"
v-model=
"ruleForm.pass"
autocomplete=
"off"
></el-input>
</div>
...
...
@@ -257,7 +254,7 @@
append-to-body
:close-on-click-modal=
"false"
:before-close=
"handleCloseTest"
>
append-to-body
>
<div
class=
"table-container table-container-repos"
style=
"height: 42vh"
>
{{
linkInfo
}}
</div>
...
...
@@ -278,7 +275,7 @@
append-to-body
:close-on-click-modal=
"false"
:before-close=
"handleCloseFeature"
>
append-to-body
>
<el-table
height=
"500"
border
:data=
"tableData"
style=
"width: 100%"
>
<el-table-column
v-for=
"(col, index) in cols"
...
...
@@ -306,7 +303,7 @@
:close-on-click-modal=
"false"
:before-close=
"handleCloseScan"
v-if=
"scanFlag"
>
append-to-body
>
<!-- 文件夹存放区域start-->
<el-tree
:data=
"scanfileTreeList"
...
...
@@ -319,6 +316,7 @@
ref=
"tree"
:props=
"defaultProps"
:highlight-current=
"true"
@
node-click=
"handleNodeClick"
>
<span
class=
"custom-tree-node"
slot-scope=
"
{ node, data }">
<span
style=
"display: flex; align: center"
>
...
...
@@ -362,6 +360,7 @@ export default {
name
:
"estab-dialog"
,
data
()
{
return
{
checkModel
:[],
linkType
:
[
{
value
:
0
,
text
:
"一般"
},
{
value
:
1
,
text
:
"高级"
},
...
...
@@ -429,7 +428,7 @@ export default {
listNames
:
Function
,
//父传过来的方法
},
created
()
{
//
this.accessData();
this
.
accessData
();
},
methods
:
{
//获取数据库详情
...
...
@@ -457,6 +456,7 @@ export default {
}
console
.
log
(
"新的对象===="
,
newObject
);
this
.
createModel
=
newObject
;
this
.
$emit
(
"getSonValue"
,
this
.
createModel
);
//组件要传回父组件的值
console
.
log
(
"编辑赋值当前对象===="
,
this
.
createModel
);
this
.
accessData
();
//获取连接类型
},
...
...
@@ -722,8 +722,14 @@ export default {
formData
.
append
(
"nodeId"
,
this
.
nodeId
);
formData
.
append
(
"text"
,
this
.
text
);
formData
.
append
(
"node"
,
this
.
node
);
setTimeout
(
this
.
scanDialogVisible
=
true
,
3000
);
this
.
scanFlag
=
true
;
this
.
scanDialogVisible
=
true
;
// this.scanDialogVisible = true;
},
// 浏览
...
...
@@ -753,6 +759,7 @@ export default {
this
.
nodeId
=
"root"
;
this
.
text
=
res
[
0
].
text
;
this
.
node
=
res
[
0
].
id
;
}
this
.
scanfileTreeList
=
res
;
...
...
@@ -795,7 +802,8 @@ export default {
if
(
res
.
length
>
0
)
{
resolve
(
res
);
}
else
if
(
!
res
.
success
)
{
let
data
=
[];
// let data = [];
let
data
=
null
;
resolve
(
data
);
}
}
else
{
...
...
@@ -804,6 +812,18 @@ export default {
});
}
},
// 点击选择当前节点
handleNodeClick
(
data
,
node
){
console
.
log
(
'点击当前节点node==='
,
node
);
console
.
log
(
'点击当前节点data==='
,
data
);
var
arr
=
[{
node
:
node
}]
this
.
$emit
(
"getSonValue"
,
arr
);
//组件要传回父组件的值,关闭弹窗
// this.nodePath=data.path;//当前选择数
// this.curNodeIconCls=data.iconCls;//当前选中节点
// console.log('当前节点的文件夹路径:',this.nodePath);
// console.log(data,'当前节点的父节点:',node.parent.data);
},
handleCloseScan
()
{
this
.
scanDialogVisible
=
false
;
...
...
@@ -819,4 +839,15 @@ export default {
background-color
:
#8888ff
;
color
:
#fff
;
}
.mybox
ul
{
margin
:
0
;
padding
:
0
;
}
.mybox
ul
li
{
list-style
:
none
;
height
:
30px
;
line-height
:
30px
;
padding
:
0
10px
;
white-space
:
nowrap
;
}
</
style
>
\ No newline at end of file
src/views/kettle/home.vue
View file @
b68b010e
...
...
@@ -643,12 +643,12 @@ export default {
this
.
explorer
(
''
);
//获取文件夹列表
// console.log(this.$refs.establishDia.linkType,'55555555555555555')
this
.
$nextTick
(
function
()
{
console
.
log
(
this
.
$refs
.
establishDia
,
'========'
)
// this.$nextTick(function () {
// console.log(this.$refs.establishDia,'========')
// // this.$refs.establishDia.accessData();//页面一加载就获取连接类型
// this.$refs.establishDia.accessData();//页面一加载就获取连接类型
this
.
$refs
.
establishDia
.
accessData
();
//页面一加载就获取连接类型
})
//
})
// this.dialogVisibleFourth=true
// this.$refs.scanDialog.dataBaseScan(formData);
...
...
src/views/output-dialog/table-out.vue
View file @
b68b010e
...
...
@@ -6,8 +6,9 @@
width=
"800px"
:before-close=
"handleClose"
top=
"10%"
>
append-to-body
>
<div
id=
"ExcelInputDialog"
></div>
<el-form
ref=
"stepName"
:model=
"stepName"
label-width=
"120px"
>
<el-form-item
label=
"步骤名称:"
>
<el-input
v-model=
"stepName.name"
></el-input>
...
...
@@ -18,7 +19,7 @@
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tab-pane
label=
"基本配置"
name=
"content"
>
<el-form
ref=
"form"
:model=
"form"
label-width=
"200px"
>
<el-form-item
label=
"数据库连接:"
>
<
!--
<
el-form-item
label=
"数据库连接:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"14"
>
<el-select
v-model=
"form.region"
style=
"width: 100%"
>
...
...
@@ -36,9 +37,10 @@
<el-button
size=
"mini"
>
向导
</el-button></el-col
>
</el-row>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"目的模式:"
>
<database-choose
ref=
"databaseChoose"
:form=
"form"
></database-choose>
<!--
<el-form-item
label=
"目的模式:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"form.name"
></el-input>
...
...
@@ -49,6 +51,19 @@
>
</el-row>
</el-form-item>
<el-form-item
label=
"目标表:"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"form.name"
></el-input>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
>
浏览
</el-button></el-col
>
</el-row>
</el-form-item>
-->
<el-form-item
label=
"提交记录数量:"
>
<el-row
:gutter=
"10"
>
...
...
@@ -271,10 +286,10 @@ export default ({
handleClose
(){
this
.
$emit
(
"update:tableOutPutVisible"
,
false
);
},
newAdd
(){
console
.
log
(
'新建弹窗'
);
this
.
$emit
(
"fathertrans"
,
true
);
//表输出组件要传回父组件的值
},
//
newAdd(){
//
console.log('新建弹窗');
//
this.$emit("fathertrans", true);//表输出组件要传回父组件的值
//
},
confirm
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment